shecs/Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
佘春生
2024-05-26 11:53:34 +08:00
parent 64cac9a99a
commit 30dce70f48
11 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+1 -1
View File
@@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
HJGL/FineUIPro.Web/Web.config
+2 -2
View File
@@ -9,7 +9,7 @@
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
</configSections>
<connectionStrings>
<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
<add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
<!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
providerName="System.Data.SqlClient" />-->
</connectionStrings>
@@ -51,7 +51,7 @@
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
<add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" validate="false"/>
</httpHandlers>
<compilation debug="false" targetFramework="4.8">
<compilation debug="true" targetFramework="4.8">
<assemblies>
<!--<add assembly="Microsoft.Build.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />-->
<add assembly="System.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx
+1 -1
View File
@@ -38,7 +38,7 @@
<f:ListItem Value="FeⅠ" Text="FeⅠ"/>
<f:ListItem Value="FeⅡ" Text="FeⅡ"/>
<f:ListItem Value="FeⅢ" Text="FeⅢ"/>
<f:ListItem Value="FeIV" Text="FeIV"/>
<f:ListItem Value="FeⅣ" Text="FeⅣ"/>
<f:ListItem Value="其它" Text="其它"/>
</f:DropDownList>
</Items>
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/PipelineManage.aspx.cs
+9 -2
View File
@@ -188,9 +188,16 @@ namespace FineUIPro.Web.WeldingManage
FROM View_Pipeline_Pipeline WHERE ProjectId= @ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
{
var area = BLL.Project_WorkAreaService.GetProject_WorkAreaByWorkAreaId(this.tvControlItem.SelectedNodeID);
if (area != null)
{
strSql += " AND WorkAreaId =@WorkAreaId";
listStr.Add(new SqlParameter("@WorkAreaId", this.tvControlItem.SelectedNodeID));
}
}
strSql += " AND WorkAreaId =@WorkAreaId";
listStr.Add(new SqlParameter("@WorkAreaId", this.tvControlItem.SelectedNodeID));
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
{
strSql += " AND PipelineCode LIKE @PipelineCode";
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs
+3 -3
View File
@@ -1254,7 +1254,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
bool canSave = false;
var jot = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(jotId);
var joty = BLL.Base_WeldTypeService.GetWeldTypeByWeldTypeId(jot.WeldTypeId);
var joty = BLL.Base_WeldTypeService.GetWeldTypeByWeldTypeId(d.WeldTypeId);
string weldTypeGroup = joty.Flag;
string weldTypeCode = joty.WeldTypeCode;
string floorWelder = floorWelderId;
@@ -1263,7 +1263,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
//decimal? sch = jot.Thickness;
string weldingMethodCode = string.Empty;
var wm = BLL.Base_WeldingMethodService.GetWeldingMethodByWeldingMethodId(jot.WeldingMethodId);
var wm = BLL.Base_WeldingMethodService.GetWeldingMethodByWeldingMethodId(d.WeldingMethodId);
if (wm != null)
{
weldingMethodCode = wm.WeldingMethodCode;
@@ -1271,7 +1271,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
string[] wmeCodes = weldingMethodCode.Split('+');
string location = string.Empty;
var loc = BLL.Base_WeldingLocationServie.GetWeldingLocationById(jot.WeldingLocationId);
var loc = BLL.Base_WeldingLocationServie.GetWeldingLocationById(d.WeldingLocationId);
if (loc != null)
{
location = loc.WeldingLocationCode;
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportEdit.aspx.cs
+3
View File
@@ -429,6 +429,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
bool canSave = false;
var jot = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(item.WeldJointId);
var joty = BLL.Base_WeldTypeService.GetWeldTypeByWeldTypeId(jot.WeldTypeId);
string weldTypeGroup = joty.Flag;
string weldTypeCode = joty.WeldTypeCode;
string floorWelder = item.BackingWelderId;
@@ -1330,7 +1331,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
item.WPQId = wps.WPQId;
if (!string.IsNullOrEmpty(wps.WeldingMethodId))
{
var met = BLL.Base_WeldingMethodService.GetWeldingMethodByWeldingMethodId(wps.WeldingMethodId);
item.WeldingMethodId = wps.WeldingMethodId;
item.WeldingMethodCode= met.WeldingMethodCode;
}
if (!string.IsNullOrEmpty(wps.WeldMatId))
{