From 5160dde702a9da6667780044f39340423ff642f0 Mon Sep 17 00:00:00 2001
From: fei550 <1420031550@qq.com>
Date: Wed, 12 Aug 2026 23:46:13 +0800
Subject: [PATCH] 1
---
SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 222 +++---------------
.../HJGL/PointTrust/PointBatch.aspx.cs | 15 +-
.../PublishProfiles/FolderProfile.pubxml | 2 +-
SGGL/Model/HJGL/HJGLQualityExtensions.cs | 105 ---------
SGGL/Model/Model.csproj | 3 +-
.../PublishProfiles/FolderProfile1.pubxml | 8 +-
6 files changed, 46 insertions(+), 309 deletions(-)
delete mode 100644 SGGL/Model/HJGL/HJGLQualityExtensions.cs
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 4cb5e9ff..1c442671 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -647,9 +647,14 @@
+
+
+
+
+
@@ -1572,25 +1577,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3706,175 +3698,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -17460,7 +17316,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs
index 8590ae18..9276e2a6 100644
--- a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs
@@ -389,20 +389,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
};
var pipeline = PointBatchService.GetPointBatchById(item.PointBatchId);
string startdate = string.Format("{0:yyyy-MM-dd}", pipeline.StartDate);
- string PipeArea = "";
- if (!string.IsNullOrEmpty(pipeline.PipelineId))
- {
- switch (PipelineService.GetPipelineByPipelineId(pipeline.PipelineId).PipeArea)
- {
- case PipelineService.PipeArea_SHOP:
- PipeArea = "(工厂)";
- break;
- case PipelineService.PipeArea_FIELD:
- PipeArea = "(现场)";
- break;
- }
- }
- string code = "DK-" + item.PointBatchCode.Substring(item.PointBatchCode.Length - 4) + PipeArea;
+ string code = "DK-" + item.PointBatchCode.Substring(item.PointBatchCode.Length - 4) ;
if (!item.EndDate.HasValue) ////批 没有关闭 粉色
{
newNode.Text = "" + code + "【" + startdate + "】" + "【" + item.UnitName + "】" + "";
diff --git a/SGGL/FineUIPro.Web/Properties/PublishProfiles/FolderProfile.pubxml b/SGGL/FineUIPro.Web/Properties/PublishProfiles/FolderProfile.pubxml
index 479b18ec..180621a8 100644
--- a/SGGL/FineUIPro.Web/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/SGGL/FineUIPro.Web/Properties/PublishProfiles/FolderProfile.pubxml
@@ -8,7 +8,7 @@
Release
Any CPU
FileSystem
- E:\Package\陕化建
+ E:\Package\陕化建\web
FileSystem
<_TargetId>Folder
diff --git a/SGGL/Model/HJGL/HJGLQualityExtensions.cs b/SGGL/Model/HJGL/HJGLQualityExtensions.cs
deleted file mode 100644
index e0edbb5d..00000000
--- a/SGGL/Model/HJGL/HJGLQualityExtensions.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System;
-using System.Data.Linq;
-using System.Data.Linq.Mapping;
-
-namespace Model
-{
- public partial class SGGLDB
- {
- public Table HJGL_PreWeldCuttingCheckMaterial
- {
- get { return GetTable(); }
- }
-
- public Table HJGL_WeldAppearanceCheck
- {
- get { return GetTable(); }
- }
- }
-
- public partial class HJGL_PreWeldCuttingCheck
- {
- [Column(DbType = "Int NOT NULL")]
- public int ReviewState { get; set; }
-
- [Column(DbType = "NVarChar(50)")]
- public string SpecialReviewerId { get; set; }
-
- [Column(DbType = "NVarChar(50)")]
- public string ReviewerId { get; set; }
-
- [Column(DbType = "DateTime")]
- public DateTime? ReviewTime { get; set; }
- }
-
- [Table(Name = "dbo.HJGL_PreWeldCuttingCheckMaterial")]
- public class HJGL_PreWeldCuttingCheckMaterial
- {
- [Column(IsPrimaryKey = true, CanBeNull = false, DbType = "NVarChar(50) NOT NULL")]
- public string CuttingCheckMaterialId { get; set; }
-
- [Column(CanBeNull = false, DbType = "NVarChar(50) NOT NULL")]
- public string CuttingCheckId { get; set; }
-
- [Column(CanBeNull = false, DbType = "NVarChar(50) NOT NULL")]
- public string PipeLineMatId { get; set; }
-
- [Column(DbType = "Int NOT NULL")]
- public int MaterialSide { get; set; }
-
- [Column(DbType = "NVarChar(100)")]
- public string OriginalMainCode { get; set; }
-
- [Column(DbType = "NVarChar(100)")]
- public string ReportedMainCode { get; set; }
-
- [Column(DbType = "Bit NOT NULL")]
- public bool IsBatchChanged { get; set; }
- }
-
- [Table(Name = "dbo.HJGL_WeldAppearanceCheck")]
- public class HJGL_WeldAppearanceCheck
- {
- [Column(IsPrimaryKey = true, CanBeNull = false, DbType = "NVarChar(50) NOT NULL")]
- public string AppearanceCheckId { get; set; }
-
- [Column(CanBeNull = false, DbType = "NVarChar(50) NOT NULL")]
- public string ProjectId { get; set; }
-
- [Column(CanBeNull = false, DbType = "NVarChar(50) NOT NULL")]
- public string WeldJointId { get; set; }
-
- [Column(DbType = "Bit NOT NULL")]
- public bool IsQualified { get; set; }
-
- [Column(CanBeNull = false, DbType = "NVarChar(50) NOT NULL")]
- public string CheckPerson { get; set; }
-
- [Column(DbType = "DateTime NOT NULL")]
- public DateTime CheckTime { get; set; }
-
- [Column(DbType = "NVarChar(500)")]
- public string Remark { get; set; }
-
- [Column(DbType = "NVarChar(50)")]
- public string CreateUser { get; set; }
-
- [Column(DbType = "DateTime NOT NULL")]
- public DateTime CreateTime { get; set; }
-
- [Column(DbType = "NVarChar(50)")]
- public string ModifyUser { get; set; }
-
- [Column(DbType = "DateTime")]
- public DateTime? ModifyTime { get; set; }
- }
-
- public partial class View_HJGL_WeldJoint
- {
- [Column(DbType = "Bit")]
- public bool? WeldAppearanceIsQualified { get; set; }
-
- [Column(DbType = "NVarChar(10) NOT NULL", CanBeNull = false)]
- public string WeldAppearanceResult { get; set; }
- }
-}
diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj
index f7998ed6..457d33c6 100644
--- a/SGGL/Model/Model.csproj
+++ b/SGGL/Model/Model.csproj
@@ -281,7 +281,6 @@
-
@@ -341,4 +340,4 @@
-->
-
+
\ No newline at end of file
diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml
index 4097680b..de09f5ff 100644
--- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml
+++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml
@@ -4,13 +4,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
-->
- True
- False
- True
+ true
+ false
+ true
Release
Any CPU
FileSystem
- E:\Package\陕化建
+ E:\Package\陕化建\API
FileSystem