diff --git a/CreateModel.bat b/CreateModel.bat index 27ceb4a..2f27853 100644 --- a/CreateModel.bat +++ b/CreateModel.bat @@ -25,9 +25,9 @@ REM -------------- @echo ÉèÖÃ.net¿ØÖÆ̨»·¾³ @echo. -@call "%VS150%" +@call "%VS100COMNTOOLS%"vsvars32.bat -SqlMetal /views /server:. /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model +SqlMetal /views /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model @ECHO Íê³É pause diff --git a/DataBase/hjglDB_7_2024.05.20.bak b/DataBase/hjglDB_7_2024.05.26-01.bak similarity index 90% rename from DataBase/hjglDB_7_2024.05.20.bak rename to DataBase/hjglDB_7_2024.05.26-01.bak index a70794c..8626767 100644 Binary files a/DataBase/hjglDB_7_2024.05.20.bak and b/DataBase/hjglDB_7_2024.05.26-01.bak differ diff --git a/DataBase/hjglDB_7_2024.05.26-01.rar b/DataBase/hjglDB_7_2024.05.26-01.rar new file mode 100644 index 0000000..6b66b0e Binary files /dev/null and b/DataBase/hjglDB_7_2024.05.26-01.rar differ diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 9260cd7..f3a538e 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 0baedd9..8d0cdf2 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ ProjectFiles - Release|Any CPU + Debug|Any CPU true diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config index f550ed2..baa8804 100644 --- a/HJGL/FineUIPro.Web/Web.config +++ b/HJGL/FineUIPro.Web/Web.config @@ -9,7 +9,7 @@
- + @@ -51,7 +51,7 @@ - + diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx index 4f38110..5d17517 100644 --- a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx +++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx @@ -38,7 +38,7 @@ - + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/PipelineManage.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/PipelineManage.aspx.cs index 5a1ba82..14631cc 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/PipelineManage.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/PipelineManage.aspx.cs @@ -188,9 +188,16 @@ namespace FineUIPro.Web.WeldingManage FROM View_Pipeline_Pipeline WHERE ProjectId= @ProjectId"; List listStr = new List(); 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"; diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs index ae4f339..5dca815 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs @@ -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; diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportEdit.aspx.cs index e43ef3d..79c24c6 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportEdit.aspx.cs @@ -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)) { diff --git a/HJGL/WebApi/WebApi.csproj.user b/HJGL/WebApi/WebApi.csproj.user index 33091aa..6db81e9 100644 --- a/HJGL/WebApi/WebApi.csproj.user +++ b/HJGL/WebApi/WebApi.csproj.user @@ -8,7 +8,7 @@ - Release|Any CPU + Debug|Any CPU FolderProfile