yx8{
zlZBS$H^(&hyEHv+Zh6v*jcG53xW6(RH#o&?dHtc~X}2E?dMkXH;W>TdW#i1J0}Ugt
zKRQ_*`QwMgMCq1FM~|@Jzh3>3d3mYtw!G|Sg1JW5zJJ!s<&NiOeONPaOl(HiioZSx
z6PhhddycG$jh@Y^*@7{>$!7OxgKs@8@)~ld3DeWBA2nIj;okhKJ8$UZ{o-fjAL`Km
z*>j^^u0r>Di6>X399yyGy!mMFpS_Z|+Xy>9SvINU)P%#&io#+o`{v&X8nb6)Zc%!`
z^A=+l^>K>s;1KKN?zM7qbI0CGO0Rx3;9btHz>NzB{bIjybJy>WUG3R0HEZ4L)x4Q!
z9ZrlgnQ@a?FYi|(-TyJrCV#9)8_VIJ`gfgjXO6DZhI3Ul?N)D(5?mN|^yr!U&@g&V
z=keX(?I}&+9-uJ}j^M9fA5{YE_(xgW6ZFZ5hS(L^@r1IXHFT5O1kF%Cn-Y6+S5msg
zMTwf~*)-Tjprr8z;$o&WjhIBgKDzi43M`d$$#7`>b9{$`tcIoBYDUZr1!Muh7BFCl
zhu;R!Uz3}td`)i1x4>fRz`A2X3F#e?dTVU{CL%c7cH&^O=0Iz=MI3KL>+aZj*NRJ
z1(nC4&W!u@uu2huRQRU{JfJXyKZNf?9oIwUSNIlP*Z~qP1J^kicSWdUAkYw!ENCkp
z%Z$S)sW6Z9T^M=TeIw(Hl;t|G+^ZKU^8#2x=ZLx~>SIq0WR&Z{z_@9p#Mg&SqJaje
zT|)5}f*dZ4ya?JEW~3}PfL`2guFM40^3zh#y4I^qRw_z(7X1G4$kik+QxC
z^rnlcGLKsl%=%{Vt$quJJm&CeY`ri{K_6CrJUKq$hOR>p@MzP?YF=>R5bht3J$4~yWDk}RhSWoTP;nI7cuMK3xB
zo2#H}c}@s9+&-hrM36(npmPS0!+}KS3?YXjh0ZmD9IkHZoDt-34MyjhLk=y5&KW}v
zKXsvVCXhpI&^c4cVV}@BGsvM{=$tv}LH!38owI=d$}m-wwSb(NB4*e51A1=_
za_jJ@^%y>
zpoIDdu%`VVRUmX1_J{n?Mh>*xt@Mb6aTx*pC&0c}3~W@6)26x#4*m;>oHt%o3N>WV
zc2hKz{S$Cg`Tr9hjn(O|Hy$XUsCCSL&rW~|Mwk!hGfP1
r6Cts;r>BotrUINm!c&rx0x4%s{mGC!r8M_I@_VO!lhoP$%OU>*adZ6S
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/PDMS输出(设计)数据模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/PDMS输出(设计)数据模板.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..a16dc883677447f4cc533aed70413e16805ecd68
GIT binary patch
literal 9891
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
Xk{rSVJ$^gcf(qz)@W!#<>=W>RGRJ`c
literal 0
HcmV?d00001
diff --git a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
index 6ee8779c..f7a0228d 100644
--- a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
+++ b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
@@ -1,5 +1,5 @@
-
+
using System;
using System.Collections;
using System.Collections.Generic;
@@ -99,7 +99,7 @@ namespace FastReport
}
-
+
@@ -113,6 +113,7 @@ namespace FastReport
+
@@ -144,54 +145,49 @@ namespace FastReport
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx
index 81cc4a25..20814597 100644
--- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx
@@ -63,7 +63,7 @@
diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
index c5db9475..877bdc87 100644
--- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
@@ -1,4 +1,5 @@
using BLL;
+using Model;
using System;
using System.Collections.Generic;
using System.Data;
@@ -169,10 +170,11 @@ namespace FineUIPro.Web.HJGL.InfoQuery
Model.ColorModel colorModel = new Model.ColorModel();
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel;
- parameter3D.TagNum = "/E-9001,/E-9002";
+ parameter3D.TagNum = "";
parameter3D.ButtonType = "0,2";
+ parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
- ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7CArea-15A";
+ ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
@@ -365,5 +367,20 @@ namespace FineUIPro.Web.HJGL.InfoQuery
}
#endregion
+ protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
+ {
+ var q = WeldJointService.GetViewWeldJointById(Grid1.SelectedRowID).PipelineCode;
+ var pipecode = "/" + q;
+ Model.Parameter3D parameter3D = new Model.Parameter3D();
+ Model.ColorModel colorModel = new Model.ColorModel();
+ colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
+ parameter3D.ColorModel = colorModel;
+ parameter3D.TagNum = pipecode;
+ parameter3D.ButtonType = "0,2";
+ parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+ ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+ ctlAuditFlow.data = parameter3D;
+ ctlAuditFlow.BindData();
+ }
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
index 9f5b1476..76b3c16f 100644
--- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
@@ -341,11 +341,11 @@ namespace FineUIPro.Web.HJGL.InfoQuery
var id = Grid1.SelectedRowID;
if (string.IsNullOrEmpty(id))
{
- ShowNotify("请选择相对应的图纸", MessageBoxIcon.Warning);
+ ShowNotify("请选择相对应的ISO轴测图", MessageBoxIcon.Warning);
return;
}
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);
+ var filemodel= BLL.HJGL_DataImportService.GetLatestFileByFileName(SingleName,"0", this.CurrUser.LoginProjectId);
if (filemodel!=null)
{
string httpUrl = filemodel.FilePath;
@@ -354,7 +354,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
}
else
{
- ShowNotify("请上传相关图纸", MessageBoxIcon.Warning);
+ ShowNotify("请上传相关ISO轴测图", MessageBoxIcon.Warning);
return;
}
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx
index 106d6d4b..d7b74527 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx
@@ -98,6 +98,7 @@
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineId"
AllowSorting="true" SortField="PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
+ OnRowClick="Grid1_RowClick" EnableRowClickEvent="true"
EnableTextSelection="True" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
-
-
+ --%>
@@ -113,12 +113,13 @@
HeaderTextAlign="Center"
TextAlign="Left">
-
-
+ --%>
+
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
index 4621d510..70c5c742 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
@@ -258,7 +258,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
{
BLL.FastReportService.ResetData();
- string strSql = @" SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,
+ 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
@@ -267,6 +267,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
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
WHERE com.QRCode!=''";
List listStr = new List { };
@@ -456,11 +457,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
var id = Grid1.SelectedRowID;
if (string.IsNullOrEmpty(id))
{
- ShowNotify("请选择相对应的图纸", MessageBoxIcon.Warning);
+ ShowNotify("请选择相对应的管道预制加工图", MessageBoxIcon.Warning);
return;
}
var SingleName = (from x in Funs.DB.HJGL_Pipeline_Component where x.PipelineComponentId == id select (x.DrawingName)).FirstOrDefault();
- var filemodel = BLL.HJGL_DataImportService.GetLatestFileByFileName(SingleName, this.CurrUser.LoginProjectId);
+ var filemodel = BLL.HJGL_DataImportService.GetLatestFileByFileName(SingleName,"3", this.CurrUser.LoginProjectId);
if (filemodel != null)
{
string httpUrl = filemodel.FilePath;
@@ -469,12 +470,37 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
else
{
- ShowNotify("请上传相关图纸", MessageBoxIcon.Warning);
+ ShowNotify("请上传相关管道预制加工图", MessageBoxIcon.Warning);
return;
}
}
+ protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
+ {
+ if (e.CommandName == "PreviewQRCode")
+ {
+ var ID = e.RowID;
+ var q = HJGL_PipelineComponentService.GetPipelineComponentById(ID);
+ string path = "";
+ if (!string.IsNullOrEmpty(q.QRCode))
+ {
+ path = BLL.CreateQRCodeService.CreateCode_Simple(q.QRCode, ID);
+ if (!string.IsNullOrEmpty(path))
+ {
+ string filepath = Funs.SGGLUrl + path.Replace("\\", "//");
+
+ ClientScript.RegisterStartupScript(ClientScript.GetType(), "myscript", "");
+
+ }
+ }
+
+
+
+
+ }
+
+ }
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs
index 2e530739..a26cdb6e 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs
@@ -230,15 +230,6 @@ namespace FineUIPro.Web.HJGL.PreDesign
///
protected global::System.Web.UI.WebControls.Label lbstate;
- ///
- /// lbImageUrl 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::System.Web.UI.WebControls.Label lbImageUrl;
-
///
/// ToolbarSeparator1 控件。
///
diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx
index ff9a48df..9f590f08 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx
@@ -45,7 +45,7 @@
TitleToolTip="试压包" AutoScroll="true" RegionPercent="30%">
diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
index 2f9e5c36..fb0af38b 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
@@ -224,10 +224,11 @@ namespace FineUIPro.Web.HJGL.TestPackage
Model.ColorModel colorModel = new Model.ColorModel();
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel;
- parameter3D.TagNum = "/E-9001,/E-9002";
+ parameter3D.TagNum = "";
parameter3D.ButtonType = "0,4";
+ parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
- ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7CArea-15A";
+ ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
}
@@ -527,5 +528,24 @@ namespace FineUIPro.Web.HJGL.TestPackage
return;
}
}
+
+ protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
+ {
+ var pTP_Pipeline = (from x in Funs.DB.PTP_PipelineList
+ where x.PT_PipeId == Grid1.SelectedRowID
+ select x).FirstOrDefault();
+ var pipe = PipelineService.GetPipelineByPipelineId(pTP_Pipeline.PipelineId);
+ var pipecode = "/" + pipe.PipelineCode;
+ Model.Parameter3D parameter3D = new Model.Parameter3D();
+ Model.ColorModel colorModel = new Model.ColorModel();
+ colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
+ parameter3D.ColorModel = colorModel;
+ parameter3D.TagNum = pipecode;
+ parameter3D.ButtonType = "0,4";
+ parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+ ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+ ctlAuditFlow.data = parameter3D;
+ ctlAuditFlow.BindData();
+ }
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
index e7af2d3f..28536a1b 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
@@ -1,4 +1,5 @@
using BLL;
+using MiniExcelLibs;
using System;
using System.Collections.Generic;
using System.Data;
@@ -116,7 +117,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
return;
}
string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower();
- if (IsXls != ".xls")
+ if (IsXls != ".xlsx")
{
ShowNotify("只可以选择Excel文件!", MessageBoxIcon.Warning);
return;
@@ -156,32 +157,34 @@ namespace FineUIPro.Web.HJGL.WeldingManage
//支持.xls和.xlsx,即包括office2010等版本的 HDR=Yes代表第一行是标题,不是数据;
try
{
- string oleDBConnString = String.Empty;
- oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
- oleDBConnString += "Data Source=";
- oleDBConnString += fileName;
- oleDBConnString += ";Extended Properties=Excel 8.0;";
- OleDbConnection oleDBConn = null;
- OleDbDataAdapter oleAdMaster = null;
- DataTable m_tableName = new DataTable();
- DataSet ds = new DataSet();
+ //string oleDBConnString = String.Empty;
+ //oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+ //oleDBConnString += "Data Source=";
+ //oleDBConnString += fileName;
+ //oleDBConnString += ";Extended Properties=Excel 8.0;";
+ //OleDbConnection oleDBConn = null;
+ //OleDbDataAdapter oleAdMaster = null;
+ //DataTable m_tableName = new DataTable();
+ //DataSet ds = new DataSet();
- oleDBConn = new OleDbConnection(oleDBConnString);
- oleDBConn.Open();
- m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+ //oleDBConn = new OleDbConnection(oleDBConnString);
+ //oleDBConn.Open();
+ //m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
- if (m_tableName != null && m_tableName.Rows.Count > 0)
- {
- m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
- }
- string sqlMaster;
- sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]";
- oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
- oleAdMaster.Fill(ds, "m_tableName");
- oleAdMaster.Dispose();
- oleDBConn.Close();
- oleDBConn.Dispose();
- var reposedata= AddDatasetToSQL(ds.Tables[0], 27);
+ //if (m_tableName != null && m_tableName.Rows.Count > 0)
+ //{
+ // m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+ //}
+ //string sqlMaster;
+ //sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]";
+ //oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+ //oleAdMaster.Fill(ds, "m_tableName");
+ //oleAdMaster.Dispose();
+ //oleDBConn.Close();
+ //oleDBConn.Dispose();
+ var ds = MiniExcel.QueryAsDataTable(fileName, useHeaderRow: true);
+
+ var reposedata = AddDatasetToSQL(ds, 27);
if (reposedata.code==1)
{
State = (int)ButtonState.Import;
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx
index 4177ab2c..63d806d7 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx
@@ -77,7 +77,7 @@
-
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
index ade6081f..8383230f 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
@@ -230,10 +230,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Model.ColorModel colorModel = new Model.ColorModel();
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel;
- parameter3D.TagNum = "/E-9001,/E-9002";
+ parameter3D.TagNum = "";
parameter3D.ButtonType = "0,3";
+ parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
- ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7CArea-15A";
+ ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
}
@@ -306,7 +307,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
}
-
+ protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
+ {
+ var model = PipelineMatService.GetPipeLineMat(Grid1.SelectedRowID);
+ var q = PipelineService.GetPipelineByPipelineId(model.PipelineId);
+ var pipecode = "/" + q.PipelineCode;
+ Model.Parameter3D parameter3D = new Model.Parameter3D();
+ Model.ColorModel colorModel = new Model.ColorModel();
+ colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
+ parameter3D.ColorModel = colorModel;
+ parameter3D.TagNum = pipecode;
+ parameter3D.ButtonType = "0,2";
+ parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+ ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+ ctlAuditFlow.data = parameter3D;
+ ctlAuditFlow.BindData();
+ }
///
/// 查询
///
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
index 20147849..c73aebd5 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
@@ -56,7 +56,7 @@
TitleToolTip="焊接日报" AutoScroll="true">
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
index 6a82eb7e..dc0f999e 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
@@ -151,10 +151,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Model.ColorModel colorModel = new Model.ColorModel();
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel;
- parameter3D.TagNum = "/E-9001,/E-9002";
+ parameter3D.TagNum = "";
parameter3D.ButtonType = "0,4";
+ parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
- ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7CArea-15A";
+ ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
@@ -268,7 +269,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
// ShowNotify("您没有这个权限,请与管理员联系!", MessageBoxIcon.Warning);
// }
//}
-
+ protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
+ {
+ var model = (from x in Funs.DB.View_HJGL_WeldJoint
+ where x.WeldJointId == Grid1.SelectedRowID
+ select x).FirstOrDefault();
+ var q = PipelineService.GetPipelineByPipelineId(model.PipelineId);
+ var pipecode = "/" + q.PipelineCode;
+ Model.Parameter3D parameter3D = new Model.Parameter3D();
+ Model.ColorModel colorModel = new Model.ColorModel();
+ colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
+ parameter3D.ColorModel = colorModel;
+ parameter3D.TagNum = pipecode;
+ parameter3D.ButtonType = "0,2";
+ parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+ ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+ ctlAuditFlow.data = parameter3D;
+ ctlAuditFlow.BindData();
+ }
///
/// 增加焊接日报
///
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx
index 04630fcb..5dd4ca96 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx
@@ -96,7 +96,7 @@
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
index 3ef71b6f..2fc37e2f 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
@@ -125,10 +125,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Model.ColorModel colorModel = new Model.ColorModel();
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel;
- parameter3D.TagNum = "/E-9001,/E-9002";
+ parameter3D.TagNum = "";
parameter3D.ButtonType = "0,1";
+ parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
- ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7CArea-15A";
+ ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
}
@@ -140,7 +141,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
///
private void BindGrid()
{
- string strSql = @"select line.PipelineId+'&'+com.PipelineComponentId as ID
+ string strSql = @"select (line.PipelineId+'&'+ISNULL(com.PipelineComponentId,'') ) as ID
,line.PipelineId
,line.PipelineCode
,line.ProjectId
@@ -286,7 +287,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
ShowNotify("您没有这个权限,请与管理员联系!", MessageBoxIcon.Warning);
}
}
-
+ protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
+ {
+ var q = PipelineService.GetPipelineByPipelineId(Grid1.SelectedRowID.Split('&')[0]);
+ var pipecode = "/" + q.PipelineCode;
+ Model.Parameter3D parameter3D = new Model.Parameter3D();
+ Model.ColorModel colorModel = new Model.ColorModel();
+ colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
+ parameter3D.ColorModel = colorModel;
+ parameter3D.TagNum = pipecode;
+ parameter3D.ButtonType = "0,1";
+ parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+ ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+ ctlAuditFlow.data = parameter3D;
+ ctlAuditFlow.BindData();
+ }
#endregion
#region 关闭弹出窗口及刷新页面