提交代码

DataBase/版本日志/SGGLDB_WH_2024-01-26-gaofei.sql

@@ -126,3 +126,83 @@ CREATE TABLE [dbo].[Transfer_Firefighting](
 ) ON [PRIMARY]
 
 GO
+
+CREATE TABLE [dbo].[Transfer_PunchlistFrom](
+	[Id] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[Item_No] [nvarchar](50) NULL,
+	[Punch_No] [nvarchar](50) NULL,
+	[SystemName] [nvarchar](50) NULL,
+	[Subsystem] [nvarchar](50) NULL,
+	[Test_Package] [nvarchar](50) NULL,
+	[Discipline] [nvarchar](50) NULL,
+	[DESCRIPTION] [nvarchar](50) NULL,
+	[Identified] [nvarchar](50) NULL,
+	[Category] [nvarchar](50) NULL,
+	[PUNCH_ITEM_FINISH_DATE] [datetime] NULL,
+	[Action_By] [nvarchar](50) NULL,
+	[Required_By] [nvarchar](50) NULL,
+	[PUNCH_ITEM_STATUS] [nvarchar](50) NULL,
+	[Comments] [nvarchar](50) NULL,
+ CONSTRAINT [PK_Transfer_PunchlistFrom] PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+
+CREATE TABLE [dbo].[Transfer_HVAC](
+	[Id] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[HVAC] [nvarchar](50) NULL,
+	[SystemName] [nvarchar](50) NULL,
+	[Subsystem] [nvarchar](50) NULL,
+	[Test_Package] [nvarchar](50) NULL,
+	[Test_Package_START] [datetime] NULL,
+	[Test_Package_FINISH] [datetime] NULL,
+	[FINAL_Status] [nvarchar](50) NULL,
+ CONSTRAINT [PK_Transfer_HVAC] PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+CREATE TABLE [dbo].[Transfer_Plumbing](
+	[Id] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[Plumbing] [nvarchar](50) NULL,
+	[SystemName] [nvarchar](50) NULL,
+	[Subsystem] [nvarchar](50) NULL,
+	[Test_Package] [nvarchar](50) NULL,
+	[Test_Package_START] [datetime] NULL,
+	[Test_Package_FINISH] [datetime] NULL,
+	[FINAL_Status] [nvarchar](50) NULL,
+ CONSTRAINT [PK_Transfer_Plumbing] PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+CREATE TABLE [dbo].[Transfer_Telecom](
+	[Id] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[Telecom] [nvarchar](50) NULL,
+	[SystemName] [nvarchar](50) NULL,
+	[Subsystem] [nvarchar](50) NULL,
+	[Test_Package] [nvarchar](50) NULL,
+	[Test_Package_START] [datetime] NULL,
+	[Test_Package_FINISH] [datetime] NULL,
+	[FINAL_Status] [nvarchar](50) NULL,
+ CONSTRAINT [PK_Transfer_Telecom] PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO

DataBase/版本日志/SGGLDB_WH_2024-01-26-phf.sql

@@ -1,5 +1,6 @@
 CREATE TABLE [dbo].[Transfer_PunchlistFrom](
 	[Id] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
 	[Item_No] [nvarchar](50) NULL,
 	[Punch_No] [nvarchar](50) NULL,
 	[SystemName] [nvarchar](50) NULL,

SGGL/BLL/Common/Const.cs

@@ -3209,7 +3209,7 @@ namespace BLL
         /// <summary>
         /// ProjectSetup导入模版文件原始的虚拟路径
         /// </summary>
-        public const string ProjectSetupDataInUrl = "File\\Excel\\DataIn\\Project Set up导入模板.xls";
+        public const string ProjectSetupDataInUrl = "File\\Excel\\DataIn\\ProjectSetup导入模板.xls";
         #endregion
 
         #region 绩效考核模板文件路径

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -1834,7 +1834,9 @@
     <Content Include="Transfer\FirefightingDataIn.aspx" />
     <Content Include="Transfer\Instrumentation.aspx" />
     <Content Include="Transfer\InstrumentationDataIn.aspx" />
+    <Content Include="Transfer\Piping.aspx" />
     <Content Include="Transfer\ProjectSetup.aspx" />
+    <Content Include="Transfer\ProjectSetupDataIn.aspx" />
     <Content Include="Video\Video.aspx" />
     <Content Include="ZHGL\DataIn\AccidentCauseReportBar.aspx" />
     <Content Include="ZHGL\DataIn\AccidentCauseReportBarIn.aspx" />
@@ -2086,6 +2088,7 @@
     <Content Include="File\Excel\TestRun\仪表索引模板.xlsx" />
     <Content Include="File\Excel\TestRun\试车系统划分.xlsx" />
     <Content Include="File\Excel\TestRun\开车方案编制计划2.xlsx" />
+    <Content Include="File\Excel\DataIn\ProjectSetup导入模板.xls" />
     <None Include="packages.config" />
     <Content Include="ReportPrint\ReportTabFile\分包商上传周报.tab" />
     <Content Include="ReportPrint\ReportTabFile\HSSE日志暨管理数据收集.tab" />
@@ -16362,6 +16365,13 @@
     <Compile Include="Transfer\InstrumentationDataIn.aspx.designer.cs">
       <DependentUpon>InstrumentationDataIn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\Piping.aspx.cs">
+      <DependentUpon>Piping.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Piping.aspx.designer.cs">
+      <DependentUpon>Piping.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Transfer\ProjectSetup.aspx.cs">
       <DependentUpon>ProjectSetup.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -16369,6 +16379,13 @@
     <Compile Include="Transfer\ProjectSetup.aspx.designer.cs">
       <DependentUpon>ProjectSetup.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\ProjectSetupDataIn.aspx.cs">
+      <DependentUpon>ProjectSetupDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\ProjectSetupDataIn.aspx.designer.cs">
+      <DependentUpon>ProjectSetupDataIn.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Video\Video.aspx.cs">
       <DependentUpon>Video.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />

SGGL/WebAPI/WebAPI.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />