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

2022-10-13 焊接修改

Browse Source
This commit is contained in:
李鹏飞
2022-10-13 18:52:45 +08:00
parent 1ca00540a3
commit 9183f74b55
25 changed files with 4019 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
+28 -25
View File
@@ -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;
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx
+1 -1
View File
@@ -77,7 +77,7 @@
</Toolbars>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="材料匹配明细"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="材料匹配明细" OnRowClick="Grid1_RowClick" EnableRowClickEvent="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="MaterialCode,Number"
EnableColumnLines="true" DataIDField="MaterialCode" AllowSorting="true" OnRowDataBound="Grid1_RowDataBound"
SortField="MaterialCode" SortDirection="ASC" OnSort="Grid1_Sort">
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+19 -3
View File
@@ -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();
}
/// <summary>
/// 查询
/// </summary>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
+1 -1
View File
@@ -56,7 +56,7 @@
TitleToolTip="焊接日报" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接日报明细" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="WeldJointId" AllowCellEditing="true"
runat="server" BoxFlex="1" DataKeyNames="WeldJointId" AllowCellEditing="true" OnRowClick="Grid1_RowClick" EnableRowClickEvent="true"
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="WeldJointId"
AllowSorting="true" SortField="PipelineCode,WeldJointCode" SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange">
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
+21 -3
View File
@@ -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();
}
/// <summary>
/// 增加焊接日报
/// </summary>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx
+1 -1
View File
@@ -96,7 +96,7 @@
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管线信息"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="ID" AllowCellEditing="true"
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="ID"
AllowSorting="true" SortField="PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort"
AllowSorting="true" SortField="PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" OnRowClick="Grid1_RowClick" EnableRowClickEvent="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
<Columns>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
+19 -4
View File
@@ -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
/// </summary>
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 关闭弹出窗口及刷新页面