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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
高飞
2023-01-19 13:26:23 +08:00
parent 932623e732 c25427af5e
commit 9e0702540e
14 changed files with 127 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/SGGL_SeDin/v17/.wsuo
BIN
View File
Binary file not shown.
SGGL/BLL/ProjectData/Project_SysSetService.cs
+27 -2
View File
@@ -1,4 +1,6 @@
using System.Linq;
using System;
using System.Linq;
using System.Web;
namespace BLL
{
@@ -14,9 +16,32 @@ namespace BLL
if (q.Count() == 0)
{
return "";
}
}
return q.First().SetValue;
}
public static string GetAvevaNetUrl_Item(string projectId)
{
string url="";
var q = from x in Funs.DB.Project_Sys_Set where x.SetId == "9" && x.ProjectId == projectId select x;
if (q.Count() == 0)
{
return "";
}
try
{
var uri = new Uri(q.First().SetValue);
var collection = HttpUtility.ParseQueryString(uri.Query);
string value = collection["portalid"];
url = q.First().SetValue + "item/" + value + "%7C";
}
catch (Exception ex )
{
url = "";
}
return url;
}
public static Model.ColorModel GetColorModel(string projectId)
{
Model.ColorModel colorModel = new Model.ColorModel();
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
+2 -2
View File
@@ -273,7 +273,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
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.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
@@ -553,7 +553,7 @@ 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.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
}
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
+2 -2
View File
@@ -146,7 +146,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
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.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
@@ -459,7 +459,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
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.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
}
SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs
+2 -2
View File
@@ -172,7 +172,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
parameter3D.ButtonType = "1";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
// parameter3D.Line_No = Line_No;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
@@ -287,7 +287,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
// parameter3D.Line_No = Line_No;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
}
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
+2 -2
View File
@@ -255,7 +255,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
}
}
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
}
@@ -595,7 +595,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
}
}
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx
+1 -1
View File
@@ -58,7 +58,7 @@
</f:Button>
<f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click">
</f:Button>
<f:Button ID="btnBatchAdd" Text="批量增加" Icon="TableAdd"
<f:Button ID="btnBatchAdd" Text="批量增加" Icon="TableAdd" Hidden="true"
runat="server" OnClick="btnBatchAdd_Click">
</f:Button>
<f:Button ID="btnAutoInput" Text="自动录入" Icon="Add" runat="server" OnClick="btnAutoInput_Click">
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
+60 -5
View File
@@ -217,10 +217,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID);
this.hdUnitWorkId.Text = string.Empty;
if (pipeline != null)
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
}
if (e.CommandName == "加载")
{
string CommandName = e.Node.ParentNode.CommandName;
@@ -229,7 +226,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage
treeNode.Nodes.Remove(e.Node);
BindNodes(e.Node.ParentNode);
}
this.BindGrid();
else
{
if (pipeline != null)
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
this.BindGrid();
}
else
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNodeID;
ckIsAudit.Checked = true;
NoAuditBindGrid();
}
}
}
protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
{
@@ -287,6 +299,49 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Grid1.DataSource = table;
Grid1.DataBind();
}
private void NoAuditBindGrid()
{
string strSql = @"SELECT WeldJointId,WeldJointCode,PipelineId,PipelineCode,JointAttribute,TwoJointType,
ComponentsCode1,ComponentsCode2,IsWelding,IsHotProessStr,Material1Code,Material2Code,
WeldTypeCode,Specification,HeartNo1,HeartNo2,Size,Dia,Thickness,GrooveTypeCode,
WeldingMethodCode,WeldingWireCode,WeldingRodCode,WeldingDate,WeldingDailyCode,
BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark,
(CASE WHEN AuditDate IS NOT NULL THEN '已审核' ELSE '未审核' END) AS IsAudit,
subMan.PersonName AS SubmitMan,auditMan.PersonName AS AuditMan,AuditDate
FROM View_HJGL_WeldJoint
LEFT JOIN dbo.Person_Persons auditMan ON auditMan.PersonId=View_HJGL_WeldJoint.AuditMan
LEFT JOIN dbo.Person_Persons subMan ON subMan.PersonId=View_HJGL_WeldJoint.SubmitMan
WHERE IsTwoJoint = 1";
List<SqlParameter> listStr = new List<SqlParameter> { };
strSql += " AND UnitWorkId =@UnitWorkId";
listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID));
if (!string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()))
{
strSql += " AND WeldJointCode LIKE @WeldJointCode";
listStr.Add(new SqlParameter("@WeldJointCode", "%" + this.txtWeldJointCode.Text.Trim() + "%"));
}
if (DropTwoJointType.SelectedValue != BLL.Const._Null)
{
strSql += " AND TwoJointType = @TwoJointType";
listStr.Add(new SqlParameter("@TwoJointType", DropTwoJointType.SelectedValue));
}
if (ckIsAudit.Checked == true)
{
strSql += " and AuditDate is null";
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
// 2.获取当前分页数据
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
#endregion
#region 分页排序
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx
+11 -4
View File
@@ -50,9 +50,15 @@
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtWeldJointCode" Label="焊口号" Readonly="true"
runat="server" FocusOnPageLoad="true" LabelWidth="100px" LabelAlign="Right">
<f:TextBox ID="txtWeldJointCode" Label="焊口号" Readonly="false"
runat="server" LabelWidth="100px" LabelAlign="Right">
</f:TextBox>
<f:Label runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpMaterial1" Label="材质1"
runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="100px" LabelAlign="Right">
</f:DropDownList>
@@ -63,6 +69,8 @@
LabelWidth="100px" DecimalPrecision="4" NoNegative="true" ShowRedStar="true" Required="true"
EnableBlurEvent="true" OnBlur="txtText_TextChanged" LabelAlign="Right">
</f:NumberBox>
<f:TextBox ID="txtDNDia" Label="公称直径" runat="server" LabelWidth="100px" LabelAlign="Right">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
@@ -103,8 +111,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtDNDia" Label="公称直径" runat="server" LabelWidth="100px" LabelAlign="Right">
</f:TextBox>
<f:Label runat="server"></f:Label>
<f:Label runat="server"></f:Label>
<f:Label runat="server"></f:Label>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs
+6 -2
View File
@@ -220,9 +220,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (!string.IsNullOrEmpty(isTwoJoint))
{
string perfix = txtPipelineCode.Text + "/Z-";
//string perfix = txtPipelineCode.Text + "/Z-";
string perfix = txtPipelineCode.Text + "/";
this.txtWeldJointCode.Text = perfix;
// txtWeldJointCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCode4ByProjectId", "dbo.HJGL_WeldJoint", "WeldJointCode", this.CurrUser.LoginProjectId, perfix);
txtWeldJointCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCode4ByProjectId", "dbo.HJGL_WeldJoint", "WeldJointCode", this.CurrUser.LoginProjectId, perfix);
// txtWeldJointCode.Text = txtWeldJointCode.Text.Replace(perfix, "");
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs
Generated
+9 -9
View File
@@ -167,6 +167,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.NumberBox txtDia;
/// <summary>
/// txtDNDia 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDNDia;
/// <summary>
/// txtSize 控件。
/// </summary>
@@ -239,15 +248,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.DropDownList DropTwoJointType;
/// <summary>
/// txtDNDia 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDNDia;
/// <summary>
/// GroupPanel2 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+2 -2
View File
@@ -276,7 +276,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
}
@@ -379,7 +379,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
+2 -2
View File
@@ -127,7 +127,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
parameter3D.ButtonType = "0";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
// PipelineService.GetPipelinesByUnitWordId(tvControlItem.SelectedNodeID);
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
}
@@ -308,7 +308,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
parameter3D.TagNum = pipecode;
parameter3D.ButtonType = "0";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
}
SGGL/FineUIPro.Web/common/mainMenu_HJGL_AVEVA.aspx.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace FineUIPro.Web
protected void Page_Load(object sender, EventArgs e)
{
ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7CArea-15A";
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) ;
PipelineService.RestPipelineAndJoints(this.CurrUser.LoginProjectId);
}