Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS

DataBase/版本日志/HJGLDB_DS_2025-09-15_gf.sql

@@ -0,0 +1,4 @@
+alter table Weld_UnitStore add IsUsed bit null
+GO
+update Weld_UnitStore set IsUsed=1
+GO

DataBase/版本日志/HJGLDB_DS_2025-09-25_bwj.sql

@@ -0,0 +1,80 @@
+
+ALTER VIEW [dbo].[HJGL_View_CH_HotProessTrustItem]
+/*热处理委托明细表查询列表*/
+AS
+SELECT TrustItem.HotProessTrustItemId, --热处理委托明细id
+		TrustItem.HotProessTrustId, -- 热处理委托id
+		JointInfo.JOT_ID, --焊口id
+		ROW_NUMBER() OVER(ORDER BY JointInfo.Sort1,JointInfo.Sort2,JointInfo.Sort3,JointInfo.Sort4,JointInfo.Sort5) as Number,
+		TrustItem.TrustDate,	
+		'' as NewJotId,	
+		IsoInfo.ISO_IsoNo,
+		JointInfo.ISO_ID,
+	   (CASE WHEN record.RepairMark IS NOT NULL THEN (JointInfo.JOT_JointNo+record.RepairMark)
+		ELSE JointInfo.JOT_JointNo END )+ISNULL(TrustItem.HardRepairMark,'') AS JOT_JointNo,
+		JointInfo.DReportID,
+		report.JOT_WeldDate,
+		TrustItem.Remark,
+		TrustItem.TrustItemID,
+		TrustItem.HardTestResultId,
+		TrustItem.HardRepairMark,
+		TrustItem.IsComplete,
+		CASE Result.IsOK WHEN 1 THEN '是'
+		                          WHEN 0 THEN '否'
+		                          ELSE '' END AS IsOKStr,
+		CASE Result.IsOK WHEN 1 THEN '已完成'
+		                          WHEN 0 THEN '未完成'
+		                          ELSE '' END AS IsOKStr2,
+		TrustItem.ProessTypes,  --热处理类型
+		JointInfo.JOT_JointDesc, --规格
+		JointInfo.ProjectId,
+		WeldMethod.WME_Code,  --焊接方法
+		--(CASE WHEN Welder1.WED_Code!=Welder2.WED_Code THEN (Welder1.WED_Code+'/'+Welder2.WED_Code) ELSE Welder1.WED_Code END) AS WED_Code, --焊工代号
+		(CASE WHEN JointInfo.JOT_CellWelder!=JointInfo.JOT_FloorWelder THEN (Welder1.WED_Code+'/'+Welder2.WED_Code) ELSE Welder1.WED_Code END) AS WED_Code, --焊工代号
+		(CASE WHEN JointInfo.STE_ID<>JointInfo.STE_ID2 THEN Steel1.STE_Code+'/'+Steel2.STE_Code
+		ELSE Steel1.STE_Code END) AS STE_Code, --材质
+		Result.IsOK,   --是否完成
+	    cast(cast(IsoInfo.ISO_DesignPress as decimal(18,2)) as nvarchar(10))+ 'Mpa' as 	ISO_DesignPress --设计压力
+FROM dbo.HJGL_PW_JointInfo AS JointInfo 
+LEFT JOIN dbo.HJGL_BS_WeldMethod WeldMethod ON WeldMethod.WME_ID=JointInfo.WME_ID
+LEFT JOIN HJGL_BS_Welder AS Welder1 ON Welder1.WED_ID = JointInfo.JOT_CellWelder
+LEFT JOIN HJGL_BS_Welder AS Welder2 ON Welder2.WED_ID = JointInfo.JOT_FloorWelder
+LEFT JOIN dbo.HJGL_BO_WeldReportMain report ON report.DReportID = JointInfo.DReportID
+LEFT JOIN dbo.HJGL_CH_HotProessTrustItem AS TrustItem ON JointInfo.JOT_ID = TrustItem.JOT_ID
+LEFT JOIN dbo.HJGL_CH_HotProessTrust AS Trust ON Trust.HotProessTrustId=TrustItem.HotProessTrustId
+LEFT JOIN dbo.HJGL_CH_RepairItemRecord AS record ON record.RepairItemRecordId=TrustItem.TrustItemID
+LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON JointInfo.ISO_ID = IsoInfo.ISO_ID
+LEFT JOIN dbo.HJGL_BS_Steel AS Steel1 ON JointInfo.STE_ID = Steel1.STE_ID
+LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON JointInfo.STE_ID2 = Steel2.STE_ID
+LEFT JOIN dbo.HJGL_CH_HotProessResult AS Result ON Result.HotProessTrustId=TrustItem.HotProessTrustId AND Result.JOT_ID=TrustItem.JOT_ID AND TrustItem.ProessTypes=Result.ProessTypes
+
+
+
+GO
+
+
+ALTER PROCEDURE [dbo].[HJGL_spCH_HotProessTrust]
+(
+   @HotProessTrustId nvarchar(50)
+)
+AS
+--通过检测id获取委托单信息
+BEGIN
+   select Project.ProjectName,
+          Project.ProjectCode,
+          c.HotProessTrustCode,
+          Unit.UnitName,
+          Users.UserName,
+          (select top 1 STE_Code from HJGL_View_CH_HotProessTrustItem c where c.HotProessTrustId = @HotProessTrustId) as STE_Code,
+          (CAST(year(c.CreateDate) as varchar)+'年'+cast(month(c.CreateDate) as varchar)+'月'+cast(day(c.CreateDate) as varchar)+'日') AS CreateDate,
+		  (select top 1 ISO_DesignPress from HJGL_View_CH_HotProessTrustItem c where c.HotProessTrustId = @HotProessTrustId) as ISO_DesignPress
+from dbo.HJGL_CH_HotProessTrust c
+LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId =c.ProjectId
+LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId =c.TrustUnitId
+LEFT JOIN dbo.Sys_User AS Users ON Users.UserId =c.TrstManId
+where c.HotProessTrustId = @HotProessTrustId
+END
+
+
+GO
+

DataBase/版本日志/HJGLDB_DS_2025-10-10_bwj.sql

@@ -0,0 +1,52 @@
+
+ALTER PROCEDURE [dbo].[HJGL_sp_rpt_TrustItem]
+(
+   @CH_TrustID NVARCHAR(50)
+)
+AS
+/******淃커밗잿꼬보룹쇱꿎官辜데츠玖깊*******/	  
+SELECT	ROW_NUMBER() OVER(ORDER BY JointInfo.Sort1,JointInfo.Sort2,JointInfo.Sort3,JointInfo.Sort4,JointInfo.Sort5) as Sort,
+ROW_NUMBER() OVER(ORDER BY JointInfo.Sort1,JointInfo.Sort2,JointInfo.Sort3,JointInfo.Sort4,JointInfo.Sort5) as Number,
+TrustItem.CH_TrustItemID,
+TrustItem.CH_TrustID,
+iso.ISO_ID,
+iso.ISO_IsoNo,
+iso.ISO_IsoNo AS ISO_Number,--데窟暠
+JointInfo.JOT_JointDesc,--보룹방목
+batch.BatchCode,
+(CASE WHEN batchDetail.PointType=2 
+      THEN JointInfo.JOT_JointNo+'K' ELSE JointInfo.JOT_JointNo END) AS JOT_JointNo,--보룹긍뵀
+(CASE WHEN JointInfo.JOT_CellWelder!=JointInfo.JOT_FloorWelder THEN Welder1.WED_Code+'/'+Welder2.WED_Code ELSE Welder1.WED_Code END) AS WED_Code,--보묏뵀
+
+ (CASE WHEN Steel.STE_Code IS NOT NULL AND Steel2.STE_Code IS NOT NULL and Steel.STE_Code!=Steel2.STE_Code
+        THEN Steel.STE_Code + '/' + Steel2.STE_Code
+        WHEN Steel.STE_Code IS NOT NULL THEN Steel.STE_Code
+        ELSE ISNULL(Steel2.STE_Code,'') END) AS STE_Code,   --꼼醴
+(CASE WHEN (TrustItem.CH_Remark IS NULL OR TrustItem.CH_Remark='') AND jotR.JOT_JointNo IS NOT NULL
+      THEN isoR.ISO_IsoNo+','+jotR.JOT_JointNo+' 럿錦' ELSE batchDetail.CheckAddress END) AS CH_Remark, --구鬧
+isoClass.ISC_IsoName,
+JointInfo.JOTY_ID,
+batchDetail.PointDate
+FROM HJGL_CH_TrustItem AS TrustItem
+LEFT JOIN dbo.HJGL_PW_JointInfo AS JointInfo ON JointInfo.JOT_ID = TrustItem.JOT_ID
+LEFT JOIN dbo.HJGL_BO_BatchDetail batchDetail on batchDetail.BatchDetailId=TrustItem.BatchDetailId
+LEFT JOIN dbo.HJGL_BO_Batch batch on batch.BatchId=batchDetail.BatchId
+LEFT JOIN dbo.HJGL_PW_IsoInfo iso on iso.ISO_ID=JointInfo.ISO_ID
+LEFT JOIN dbo.HJGL_BS_Steel AS Steel ON Steel.STE_ID = JointInfo.STE_ID
+LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=JointInfo.STE_ID2
+LEFT JOIN dbo.HJGL_BS_Welder AS Welder1 ON Welder1.WED_ID = JointInfo.JOT_CellWelder
+LEFT JOIN dbo.HJGL_BS_Welder AS Welder2 ON Welder2.WED_ID = JointInfo.JOT_FloorWelder
+LEFT JOIN dbo.HJGL_CH_RepairItemRecord AS repair ON batchDetail.ToRepairId=repair.RepairItemRecordId
+LEFT JOIN dbo.HJGL_PW_JointInfo AS jotR ON jotR.JOT_ID = repair.JOT_ID
+LEFT JOIN dbo.HJGL_PW_IsoInfo AS isoR ON isoR.ISO_ID = repair.ISO_ID
+LEFT JOIN HJGL_BS_IsoClass AS isoClass ON isoClass.ISC_ID = iso.ISC_ID
+WHERE TrustItem.CH_TrustID=@CH_TrustID
+
+union
+
+SELECT 99999 as Sort,null, NEWID(), NULL,null, '鹿苟왕겜' AS ISO_IsoNo,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,null,null
+
+order by Sort
+GO
+
+

DataBase/版本日志/HJGLDB_DS_2025-10-12_bwj.sql

@@ -0,0 +1,60 @@
+
+
+ALTER PROCEDURE [dbo].[HJGL_spCH_HotProessTrustItem]
+(
+   @HotProessTrustId nvarchar(50),
+   @ProessTypes nvarchar(50)=null
+)
+AS
+--通过检测id获取委托单信息
+BEGIN
+   select *,
+   ProessTypes1+
+    (case when ProessTypes1<>'' and ProessTypes2<>'' then ','+ ProessTypes2 else ProessTypes2 end)
+   +(case when (ProessTypes1<>'' or ProessTypes2<>'') and ProessTypes3<>'' then ','+ ProessTypes3 else ProessTypes3 end)
+   +(case when (ProessTypes1<>'' or ProessTypes2<>'' or ProessTypes3<>'') and ProessTypes4<>'' then ','+ ProessTypes4 else ProessTypes4 end)
+   +(case when (ProessTypes1<>'' or ProessTypes2<>'' or ProessTypes3<>'' or ProessTypes4<>'') and ProessTypes5<>'' then ','+ ProessTypes5 else ProessTypes5 end) as ProessTypes
+   from
+   (
+   select --ROW_NUMBER() OVER(ORDER BY JOT_JointNo) as Sort,
+   --ROW_NUMBER() OVER(ORDER BY JOT_JointNo) as Number,
+		c.Number,
+        c.HotProessTrustItemId, --热处理委托明细id
+		c.HotProessTrustId, -- 热处理委托id
+		c.JOT_ID, --焊口id
+		c.TrustDate,		
+		c.ISO_IsoNo,
+		c.JOT_JointNo,	
+		c.Remark,
+		ProessTypes1 =case when ProessTypes like '%1%' then '预热'
+		     else '' end,
+		ProessTypes2 =case when ProessTypes like '%2%' then '消氢'
+		     else '' end,   
+		ProessTypes3 =case when ProessTypes like '%3%' then '后热'
+		     else '' end,   
+		ProessTypes4 =case when ProessTypes like '%4%' then '消应力热处理'
+		     else '' end,  
+		ProessTypes5 =case when ProessTypes like '%5%' then '稳定化处理'
+		     else '' end,    
+		c.JOT_JointDesc, --规格
+		c.ProjectId,
+		c.STE_Code,   --材质
+		c.WME_Code,   --焊接方法
+		c.WED_Code    --焊工代号
+from dbo.HJGL_View_CH_HotProessTrustItem c
+where c.HotProessTrustId = @HotProessTrustId
+and (c.ProessTypes=@ProessTypes or @ProessTypes is null)
+) as t
+--order by t.ISO_IsoNo,t.JOT_JointNo
+
+
+union 
+
+select 99999999 as Number,null,null,null,null,'以下空白' AS ISO_IsoNo,null,null,null,null,null,null,null,null,null,null,null,null,null
+
+order by Number
+
+END
+GO
+
+

DataBase/版本日志/HJGLDB_DS_2025-10-12_gf.sql

@@ -0,0 +1,61 @@
+
+ALTER VIEW [dbo].[HJGL_View_CH_HotProessTrustItem]
+/*热处理委托明细表查询列表*/
+AS
+SELECT TrustItem.HotProessTrustItemId, --热处理委托明细id
+		TrustItem.HotProessTrustId, -- 热处理委托id
+		JointInfo.JOT_ID, --焊口id
+		ROW_NUMBER() OVER(ORDER BY JointInfo.Sort1,JointInfo.Sort2,JointInfo.Sort3,JointInfo.Sort4,JointInfo.Sort5) as Number,
+		TrustItem.TrustDate,	
+		'' as NewJotId,	
+		IsoInfo.ISO_IsoNo,
+		JointInfo.ISO_ID,
+	   (CASE WHEN record.RepairMark IS NOT NULL THEN (JointInfo.JOT_JointNo+record.RepairMark)
+		ELSE JointInfo.JOT_JointNo END )+ISNULL(TrustItem.HardRepairMark,'') AS JOT_JointNo,
+		JointInfo.DReportID,
+		report.JOT_WeldDate,
+		TrustItem.Remark,
+		TrustItem.TrustItemID,
+		TrustItem.HardTestResultId,
+		TrustItem.HardRepairMark,
+		TrustItem.IsComplete,
+		CASE Result.IsOK WHEN 1 THEN '是'
+		                          WHEN 0 THEN '否'
+		                          ELSE '' END AS IsOKStr,
+		CASE Result.IsOK WHEN 1 THEN '已完成'
+		                          WHEN 0 THEN '未完成'
+		                          ELSE '' END AS IsOKStr2,
+		TrustItem.ProessTypes,  --热处理类型
+		JointInfo.JOT_JointDesc, --规格
+		JointInfo.ProjectId,
+		JointInfo.Sort1,
+		JointInfo.Sort2,
+		JointInfo.Sort3,
+		JointInfo.Sort4,
+		JointInfo.Sort5,
+		WeldMethod.WME_Code,  --焊接方法
+		--(CASE WHEN Welder1.WED_Code!=Welder2.WED_Code THEN (Welder1.WED_Code+'/'+Welder2.WED_Code) ELSE Welder1.WED_Code END) AS WED_Code, --焊工代号
+		(CASE WHEN JointInfo.JOT_CellWelder!=JointInfo.JOT_FloorWelder THEN (Welder1.WED_Code+'/'+Welder2.WED_Code) ELSE Welder1.WED_Code END) AS WED_Code, --焊工代号
+		(CASE WHEN JointInfo.STE_ID<>JointInfo.STE_ID2 THEN Steel1.STE_Code+'/'+Steel2.STE_Code
+		ELSE Steel1.STE_Code END) AS STE_Code, --材质
+		Result.IsOK,   --是否完成
+	    cast(cast(IsoInfo.ISO_DesignPress as decimal(18,2)) as nvarchar(10))+ 'Mpa' as 	ISO_DesignPress --设计压力
+FROM dbo.HJGL_PW_JointInfo AS JointInfo 
+LEFT JOIN dbo.HJGL_BS_WeldMethod WeldMethod ON WeldMethod.WME_ID=JointInfo.WME_ID
+LEFT JOIN HJGL_BS_Welder AS Welder1 ON Welder1.WED_ID = JointInfo.JOT_CellWelder
+LEFT JOIN HJGL_BS_Welder AS Welder2 ON Welder2.WED_ID = JointInfo.JOT_FloorWelder
+LEFT JOIN dbo.HJGL_BO_WeldReportMain report ON report.DReportID = JointInfo.DReportID
+LEFT JOIN dbo.HJGL_CH_HotProessTrustItem AS TrustItem ON JointInfo.JOT_ID = TrustItem.JOT_ID
+LEFT JOIN dbo.HJGL_CH_HotProessTrust AS Trust ON Trust.HotProessTrustId=TrustItem.HotProessTrustId
+LEFT JOIN dbo.HJGL_CH_RepairItemRecord AS record ON record.RepairItemRecordId=TrustItem.TrustItemID
+LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON JointInfo.ISO_ID = IsoInfo.ISO_ID
+LEFT JOIN dbo.HJGL_BS_Steel AS Steel1 ON JointInfo.STE_ID = Steel1.STE_ID
+LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON JointInfo.STE_ID2 = Steel2.STE_ID
+LEFT JOIN dbo.HJGL_CH_HotProessResult AS Result ON Result.HotProessTrustId=TrustItem.HotProessTrustId AND Result.JOT_ID=TrustItem.JOT_ID AND TrustItem.ProessTypes=Result.ProessTypes
+
+
+
+
+GO
+
+

DataBase/版本日志/HJGLDB_DS_2025-10-14_bwj.sql

@@ -0,0 +1,28 @@
+
+ALTER PROCEDURE [dbo].[HJGL_spCH_HotProessTrustItem]
+(
+   @HotProessTrustId nvarchar(50),
+   @ProessTypes nvarchar(50)=null
+)
+AS
+--通过检测id获取委托单信息
+BEGIN
+
+
+select HotProessTrustId,ISO_IsoNo,JOT_JointNo,JOT_JointDesc,STE_Code,
+STRING_AGG((case when ProessTypes='1' then '预热'
+		when ProessTypes='2' then '消氢'
+		when ProessTypes='3' then '后热'
+		when ProessTypes='4' then '消应力热处理'
+		when ProessTypes='5' then '稳定化处理'
+		else ''end),'+') as ProessTypes  from HJGL_View_CH_HotProessTrustItem TrustItem
+		where HotProessTrustId=@HotProessTrustId
+		and (ProessTypes=@ProessTypes or @ProessTypes is null)
+		group by HotProessTrustId,ISO_IsoNo,JOT_JointNo,JOT_JointDesc,STE_Code
+
+union 
+
+select '99999999' as Number,'以下空白' AS ISO_IsoNo,null,null,null,null
+
+end
+go

HJGL_DS/BLL/WeldMat/BaseInfo/UnitStoreService.cs

@@ -35,6 +35,7 @@ namespace BLL
             newUnitStore.UnitStoreCode = unitStore.UnitStoreCode;
             newUnitStore.UnitStoreName = unitStore.UnitStoreName;
             newUnitStore.StorePosition = unitStore.StorePosition;
+            newUnitStore.IsUsed = unitStore.IsUsed;
             db.Weld_UnitStore.InsertOnSubmit(newUnitStore);
             db.SubmitChanges();
         }
@@ -53,6 +54,7 @@ namespace BLL
                 newUnitStore.UnitStoreCode = unitStore.UnitStoreCode;
                 newUnitStore.UnitStoreName = unitStore.UnitStoreName;
                 newUnitStore.StorePosition = unitStore.StorePosition;
+                newUnitStore.IsUsed = unitStore.IsUsed;
                 db.SubmitChanges();
             }
         }
@@ -118,6 +120,7 @@ namespace BLL
         {
             var store = from x in Funs.DB.Weld_UnitStore
                         join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        where x.IsUsed == true
                         orderby y.UnitName, x.UnitStoreCode
                         select new { x.UnitStoreId, UnitStoreName = x.UnitStoreName, y.UnitName, x.UnitId };
             if (!string.IsNullOrEmpty(unitId))

HJGL_DS/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs

@@ -339,10 +339,12 @@ namespace FineUIPro.Web.ContinuousPrint
                         string isoid = rows2[0]["ISO_ID"].ToString();
                         string jotyId = rows2[0]["JOTY_ID"].ToString();
                         int jointCount = BLL.HJGL_PW_JointInfoService.GetJointCountByIsoId(isoid, jotyId);
+                        string pointDate = string.Format("{0:yyyy-MM-dd}", rows2[0]["PointDate"]);
                         //传参
                         Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
                         keyValuePairs.Add("JointCount", jointCount.ToString());
-                        keyValuePairs.Add("CheckCount", (rows.Count() - 1).ToString());
+                        keyValuePairs.Add("CheckCount", (rows2.Count() - 1).ToString());
+                        keyValuePairs.Add("pointDate", pointDate);
                         BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
 
                         initTemplatePath = "File\\Fastreport\\管道焊缝检测委托单.frx";

HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs

@@ -87,7 +87,7 @@ namespace FineUIPro.Web.ContinuousPrint
                             left join HJGL_PW_IsoInfo isoInfo on isoInfo.ISO_ID=joint.ISO_ID
                             LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = joint.ProjectId
                             left join HJGL_BO_WeldReportMain weldReport on weldReport.DReportID = joint.DReportID
-                            LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID
+                            LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = batch.JOTY_ID
                             LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where batch.ProjectId=@ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", ProjectId));

HJGL_DS/FineUIPro.Web/ErrLog.txt

@@ -1,155 +1 @@
 
-错误信息开始=====>
-错误类型:SqlException
-错误信息:在与 SQL Server 建立连接时出现与网络相关的或特定于实例的错误。未找到或无法访问服务器。请验证实例名称是否正确并且 SQL Server 已配置为允许远程连接。 (provider: SQL Network Interfaces, error: 26 - 定位指定的服务器/实例时出错)
-错误堆栈:
-   在 System.Data.SqlClient.SqlInternalConnectionTds..ctor(DbConnectionPoolIdentity identity, SqlConnectionString connectionOptions, SqlCredential credential, Object providerInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionString userConnectionOptions, SessionData reconnectSessionData, DbConnectionPool pool, String accessToken, Boolean applyTransientFaultHandling, SqlAuthenticationProviderManager sqlAuthProviderManager)
-   在 System.Data.SqlClient.SqlConnectionFactory.CreateConnection(DbConnectionOptions options, DbConnectionPoolKey poolKey, Object poolGroupProviderInfo, DbConnectionPool pool, DbConnection owningConnection, DbConnectionOptions userOptions)
-   在 System.Data.ProviderBase.DbConnectionFactory.CreatePooledConnection(DbConnectionPool pool, DbConnection owningObject, DbConnectionOptions options, DbConnectionPoolKey poolKey, DbConnectionOptions userOptions)
-   在 System.Data.ProviderBase.DbConnectionPool.CreateObject(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)
-   在 System.Data.ProviderBase.DbConnectionPool.UserCreateRequest(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)
-   在 System.Data.ProviderBase.DbConnectionPool.TryGetConnection(DbConnection owningObject, UInt32 waitForMultipleObjectsTimeout, Boolean allowCreate, Boolean onlyOneCheckConnection, DbConnectionOptions userOptions, DbConnectionInternal& connection)
-   在 System.Data.ProviderBase.DbConnectionPool.TryGetConnection(DbConnection owningObject, TaskCompletionSource`1 retry, DbConnectionOptions userOptions, DbConnectionInternal& connection)
-   在 System.Data.ProviderBase.DbConnectionFactory.TryGetConnection(DbConnection owningConnection, TaskCompletionSource`1 retry, DbConnectionOptions userOptions, DbConnectionInternal oldConnection, DbConnectionInternal& connection)
-   在 System.Data.ProviderBase.DbConnectionInternal.TryOpenConnectionInternal(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource`1 retry, DbConnectionOptions userOptions)
-   在 System.Data.SqlClient.SqlConnection.TryOpenInner(TaskCompletionSource`1 retry)
-   在 System.Data.SqlClient.SqlConnection.TryOpen(TaskCompletionSource`1 retry)
-   在 System.Data.SqlClient.SqlConnection.Open()
-   在 System.Data.Linq.SqlClient.SqlConnectionManager.UseConnection(IConnectionUser user)
-   在 System.Data.Linq.SqlClient.SqlProvider.get_IsSqlCe()
-   在 System.Data.Linq.SqlClient.SqlProvider.InitializeProviderMode()
-   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
-   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
-   在 BLL.Sys_UserService.UserLogOn(String account, String password, Boolean rememberMe, Page page) 位置 E:\鼎盛\HJGL_DS\HJGL_DS\BLL\Common\SysManage\Sys_UserService.cs:行号 39
-   在 FineUIPro.Web.Login.btnLogin_Click(Object sender, EventArgs e) 位置 E:\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\Login.aspx.cs:行号 52
-   在 FineUIPro.Button.OnClick(EventArgs e)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:06/26/2025 10:36:58
-出错文件:http://localhost:64304/Login.aspx
-IP地址:::1
-
-出错时间:06/26/2025 10:36:58
-
-
-错误信息开始=====>
-错误类型:HttpException
-错误信息:服务器无法在发送 HTTP 标头之后设置内容类型。
-错误堆栈:
-   在 System.Web.HttpResponse.set_ContentType(String value)
-   在 (HttpResponse , String )
-   在 hZzEMoBFowQHNetYNlTaFyfiuHiLc.hXMADyGEgDdbFxdyPzsZtZEjxqkq()
-   在 (hZzEMoBFowQHNetYNlTaFyfiuHiLc )
-   在 hZzEMoBFowQHNetYNlTaFyfiuHiLc.hXMADyGEgDdbFxdyPzsZtZEjxqkq(Object , EventArgs )
-   在 System.Web.UI.Page.OnPreRenderComplete(EventArgs e)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:07/07/2025 10:10:27
-出错文件:http://localhost:64304/HJGL/DataIn/JointIn.aspx
-IP地址:::1
-操作人员:管理员
-
-出错时间:07/07/2025 10:10:27
-
-
-错误信息开始=====>
-错误类型:FormatException
-错误信息:输入字符串的格式不正确。
-错误堆栈:
-   在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
-   在 System.Number.ParseDecimal(String value, NumberStyles options, NumberFormatInfo numfmt)
-   在 System.Decimal.Parse(String s)
-   在 BLL.Funs.GetNewDecimalOrZero(String value) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\BLL\Funs.cs:行号 386
-出错时间:07/08/2025 16:56:56
-出错时间:07/08/2025 16:56:56
-
-
-错误信息开始=====>
-错误类型:NullReferenceException
-错误信息:未将对象引用设置到对象的实例。
-错误堆栈:
-   在 FineUIPro.Web._default.Page_Init(Object sender, EventArgs e) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\default.aspx.cs:行号 114
-   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   在 System.Web.UI.Control.OnInit(EventArgs e)
-   在 System.Web.UI.Page.OnInit(EventArgs e)
-   在 FineUIPro.Web.PageBase.OnInit(EventArgs e) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\common\PageBase.cs:行号 135
-   在 System.Web.UI.Control.InitRecursive(Control namingContainer)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:07/24/2025 16:12:09
-出错文件:http://localhost:64304/default.aspx
-IP地址:::1
-
-出错时间:07/24/2025 16:12:09
-
-
-错误信息开始=====>
-错误类型:NullReferenceException
-错误信息:未将对象引用设置到对象的实例。
-错误堆栈:
-   在 FineUIPro.Web.PageBase.OnInit(EventArgs e) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\common\PageBase.cs:行号 121
-   在 System.Web.UI.Control.InitRecursive(Control namingContainer)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:07/28/2025 11:13:06
-出错文件:http://localhost:64304/WeldMat/UsingSentMat/WelderUsing.aspx
-IP地址:::1
-操作人员:管理员
-
-出错时间:07/28/2025 11:13:06
-
-
-错误信息开始=====>
-错误类型:HttpCompileException
-错误信息:d:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\WeldMat\Stock\StockIn.aspx(132): error CS1061: “ASP.weldmat_stock_stockin_aspx”不包含“btnMenuConfirm_Click”的定义，并且找不到可接受类型为“ASP.weldmat_stock_stockin_aspx”的第一个参数的扩展方法“btnMenuConfirm_Click”(是否缺少 using 指令或程序集引用?)
-错误堆栈:
-   在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
-   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
-   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
-   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
-   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
-   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
-   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
-出错时间:08/04/2025 15:24:06
-出错文件:http://localhost:64304/WeldMat/Stock/StockIn.aspx
-IP地址:::1
-
-出错时间:08/04/2025 15:24:06
-
-
-错误信息开始=====>
-错误类型:SqlException
-错误信息:在与 SQL Server 建立连接时出现与网络相关的或特定于实例的错误。未找到或无法访问服务器。请验证实例名称是否正确并且 SQL Server 已配置为允许远程连接。 (provider: SQL Network Interfaces, error: 26 - 定位指定的服务器/实例时出错)
-错误堆栈:
-   在 System.Data.SqlClient.SqlInternalConnectionTds..ctor(DbConnectionPoolIdentity identity, SqlConnectionString connectionOptions, SqlCredential credential, Object providerInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionString userConnectionOptions, SessionData reconnectSessionData, DbConnectionPool pool, String accessToken, Boolean applyTransientFaultHandling, SqlAuthenticationProviderManager sqlAuthProviderManager)
-   在 System.Data.SqlClient.SqlConnectionFactory.CreateConnection(DbConnectionOptions options, DbConnectionPoolKey poolKey, Object poolGroupProviderInfo, DbConnectionPool pool, DbConnection owningConnection, DbConnectionOptions userOptions)
-   在 System.Data.ProviderBase.DbConnectionFactory.CreatePooledConnection(DbConnectionPool pool, DbConnection owningObject, DbConnectionOptions options, DbConnectionPoolKey poolKey, DbConnectionOptions userOptions)
-   在 System.Data.ProviderBase.DbConnectionPool.CreateObject(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)
-   在 System.Data.ProviderBase.DbConnectionPool.UserCreateRequest(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)
-   在 System.Data.ProviderBase.DbConnectionPool.TryGetConnection(DbConnection owningObject, UInt32 waitForMultipleObjectsTimeout, Boolean allowCreate, Boolean onlyOneCheckConnection, DbConnectionOptions userOptions, DbConnectionInternal& connection)
-   在 System.Data.ProviderBase.DbConnectionPool.TryGetConnection(DbConnection owningObject, TaskCompletionSource`1 retry, DbConnectionOptions userOptions, DbConnectionInternal& connection)
-   在 System.Data.ProviderBase.DbConnectionFactory.TryGetConnection(DbConnection owningConnection, TaskCompletionSource`1 retry, DbConnectionOptions userOptions, DbConnectionInternal oldConnection, DbConnectionInternal& connection)
-   在 System.Data.ProviderBase.DbConnectionInternal.TryOpenConnectionInternal(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource`1 retry, DbConnectionOptions userOptions)
-   在 System.Data.ProviderBase.DbConnectionClosed.TryOpenConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource`1 retry, DbConnectionOptions userOptions)
-   在 System.Data.SqlClient.SqlConnection.TryOpenInner(TaskCompletionSource`1 retry)
-   在 System.Data.SqlClient.SqlConnection.TryOpen(TaskCompletionSource`1 retry)
-   在 System.Data.SqlClient.SqlConnection.Open()
-   在 System.Data.Linq.SqlClient.SqlConnectionManager.UseConnection(IConnectionUser user)
-   在 System.Data.Linq.SqlClient.SqlProvider.get_IsSqlCe()
-   在 System.Data.Linq.SqlClient.SqlProvider.InitializeProviderMode()
-   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
-   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
-   在 System.Linq.Queryable.Count[TSource](IQueryable`1 source)
-   在 BLL.Sys_UserService.UserLogOn(String account, String password, Boolean rememberMe, Page page) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\BLL\Common\SysManage\Sys_UserService.cs:行号 39
-   在 FineUIPro.Web.Login.btnLogin_Click(Object sender, EventArgs e)
-   在 FineUIPro.Button.OnClick(EventArgs e)
-   在 (Button , EventArgs )
-   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:08/07/2025 10:39:13
-出错文件:http://localhost:64304/Login.aspx
-IP地址:::1
-
-出错时间:08/07/2025 10:39:13
-

HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="11/21/2024 15:06:49" ReportInfo.Modified="08/12/2025 14:54:39" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="11/21/2024 15:06:49" ReportInfo.Modified="09/25/2025 14:16:18" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,12 +42,13 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QF9KaaYnf752kTTcgAAMfUGw==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFLsbctPP35IDspe10eEn2TQ==">
       <TableDataSource Name="MainData" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="MainData">
         <Column Name="ProjectName" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="ProjectCode" DataType="System.String" PropName="image_series"/>
         <Column Name="UnitName" DataType="System.String" PropName="file_name"/>
         <Column Name="HotProessTrustCode" DataType="System.String" PropName="file_size"/>
+        <Column Name="ISO_DesignPress" DataType="System.String" PropName="Column"/>
       </TableDataSource>
       <TableDataSource Name="Data" DataType="System.Int32" PropName="AttachFile" Enabled="true" TableName="Data">
         <Column Name="SortNum" DataType="System.String" PropName="AttachFileId"/>
@@ -59,9 +60,9 @@ namespace FastReport
       </TableDataSource>
     </MsSqlDataConnection>
   </Dictionary>
-  <ReportPage Name="Page1" LeftMargin="25" TopMargin="20" RightMargin="20" BottomMargin="21" FirstPageSource="4" OtherPagesSource="4" Guides="0,623.22,141.67,66.07,94.42,103.87,132.22,84.97,387.13,491,226.64,292.71,623.28,84.98,226.66,292.74,387.17,491.05,84.78,227.47,103.68,293.35,387.58,491.26,623.29,316.37">
+  <ReportPage Name="Page1" LeftMargin="25" TopMargin="20" RightMargin="20" BottomMargin="21" FirstPageSource="4" OtherPagesSource="4" Guides="0,623.22,141.67,66.07,94.42,103.87,132.22,84.97,387.13,491,226.64,292.71,623.28,84.98,226.66,292.74,387.17,491.05,84.78,227.47,103.68,293.35,387.58,491.26,623.29,316.37,519.75">
-    <PageHeaderBand Name="PageHeader1" Width="623.7" Height="258.18" Guides="0,258.18,17.71,48.67,30.96,84.58,35.91,111.74,27.16,148.35,36.61,184.96,221.57">
+    <PageHeaderBand Name="PageHeader1" Width="623.7" Height="248.73" Guides="0,248.73,17.71,48.67,30.96,84.58,35.91,102.29,138.9,36.61,175.51,212.12">
-      <TableObject Name="Table1" Width="623.22" Height="258.18">
+      <TableObject Name="Table1" Width="623.22" Height="248.73">
         <TableColumn Name="Column1" Width="84.97"/>
         <TableColumn Name="Column2" Width="141.67"/>
         <TableColumn Name="Column3" Width="66.07"/>
@@ -69,7 +70,7 @@ namespace FastReport
         <TableColumn Name="Column5" Width="103.87"/>
         <TableColumn Name="Column6" Width="132.22"/>
         <TableRow Name="Row1" Height="17.71">
-          <TableCell Name="Cell1" Text="ZDS-T6.60.005.A/0.2021" HorzAlign="Right" VertAlign="Center" ColSpan="6"/>
+          <TableCell Name="Cell1" Text="ZDS-T6.58.005.A/0.2025" HorzAlign="Right" VertAlign="Center" ColSpan="6"/>
           <TableCell Name="Cell2" HorzAlign="Right" VertAlign="Center"/>
           <TableCell Name="Cell3" HorzAlign="Right" VertAlign="Center"/>
           <TableCell Name="Cell4" HorzAlign="Right" VertAlign="Center"/>
@@ -92,8 +93,8 @@ namespace FastReport
           <TableCell Name="Cell15"/>
           <TableCell Name="Cell28"/>
         </TableRow>
-        <TableRow Name="Row4" Height="27.16">
+        <TableRow Name="Row4" Height="17.71">
-          <TableCell Name="Cell16" Text="共[TotalPages#]页 第[Page#]页" HorzAlign="Right" VertAlign="Center" ColSpan="6"/>
+          <TableCell Name="Cell16" Text="共[TotalPages#]页 第[Page#]页" HorzAlign="Center" VertAlign="Center" ColSpan="6"/>
           <TableCell Name="Cell17"/>
           <TableCell Name="Cell18"/>
           <TableCell Name="Cell19"/>
@@ -110,31 +111,31 @@ namespace FastReport
         </TableRow>
         <TableRow Name="Row6" Height="36.61">
           <TableCell Name="Cell31" Border.Lines="All" Text="委托单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell32" Border.Lines="All" Text="[MainData.UnitName]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="3"/>
+          <TableCell Name="Cell32" Border.Lines="All" Text="浙江鼎盛石化工程有限公司" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="3"/>
           <TableCell Name="Cell33" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
           <TableCell Name="Cell34" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
           <TableCell Name="Cell35" Border.Lines="All" Text="热处理单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell36" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell36" Border.Lines="All" Text="吴江市天宇工程技术服务有限公司" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row7" Height="36.61">
           <TableCell Name="Cell37" Border.Lines="All" Text="委托单编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell38" Border.Lines="All" Text="[MainData.HotProessTrustCode]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="3"/>
           <TableCell Name="Cell39" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
           <TableCell Name="Cell40" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
-          <TableCell Name="Cell41" Border.Lines="All" Text="管道压力等级" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell41" Border.Lines="All" Text="设计压力" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell42" Border.Lines="All" Text="低中压□  高压□  " HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell42" Border.Lines="All" Text="[MainData.ISO_DesignPress]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row8" Height="36.61">
           <TableCell Name="Cell43" Border.Lines="All" Text="序号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell44" Border.Lines="All" Text="设备名称或管线号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell45" Border.Lines="All" Text="焊口号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell46" Border.Lines="All" Text="规格" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell46" Border.Lines="All" Text="材质" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell47" Border.Lines="All" Text="材质" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell47" Border.Lines="All" Text="规格" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell48" Border.Lines="All" Text="热处理类型" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell48" Border.Lines="All" Text="热处理类别" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
       </TableObject>
     </PageHeaderBand>
-    <DataBand Name="Data1" Top="262.18" Width="623.7" Height="37.8" Guides="0,37.8">
+    <DataBand Name="Data1" Top="252.73" Width="623.7" Height="37.8" Guides="0,37.8">
       <TableObject Name="Table2" Width="623.28" Height="37.8" Border.Lines="Right" ManualBuildEvent="Table2_ManualBuild">
         <TableColumn Name="Column24" Width="84.98"/>
         <TableColumn Name="Column25" Width="141.68"/>
@@ -146,14 +147,14 @@ namespace FastReport
           <TableCell Name="Cell132" Border.Lines="All" Text="[Data.SortNum]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
           <TableCell Name="Cell133" Border.Lines="All" Text="[Data.ISO_IsoNo]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
           <TableCell Name="Cell134" Border.Lines="All" Text="[Data.JOT_JointNo]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
-          <TableCell Name="Cell135" Border.Lines="All" Text="[Data.JOT_JointDesc]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell135" Border.Lines="All" Text="[Data.STE_Code]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
-          <TableCell Name="Cell136" Border.Lines="All" Text="[Data.STE_Code]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell136" Border.Lines="All" Text="[Data.JOT_JointDesc]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
           <TableCell Name="Cell157" Border.Lines="All" Text="[Data.ProessTypes]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
         </TableRow>
       </TableObject>
     </DataBand>
-    <ColumnFooterBand Name="ColumnFooter1" Top="345.78" Width="623.7">
+    <ColumnFooterBand Name="ColumnFooter1" Top="336.33" Width="623.7">
-      <ChildBand Name="Child1" Top="303.98" Width="623.7" Height="37.8" Guides="0,37.8" FillUnusedSpace="true">
+      <ChildBand Name="Child1" Top="294.53" Width="623.7" Height="37.8" Guides="0,37.8" FillUnusedSpace="true">
         <TableObject Name="Table3" Width="623.29" Height="37.8">
           <TableColumn Name="Column15" Width="84.78"/>
           <TableColumn Name="Column16" Width="39.01"/>
@@ -174,12 +175,12 @@ namespace FastReport
         </TableObject>
       </ChildBand>
     </ColumnFooterBand>
-    <PageFooterBand Name="PageFooter1" Top="349.78" Width="623.7" Height="104.45" Guides="0,104.45,35.15,79.25">
+    <PageFooterBand Name="PageFooter1" Top="340.33" Width="623.7" Height="151.7" Guides="0,104.45,35.15,79.25,113.4,151.2">
       <TableObject Name="Table4" Width="623.29" Height="104.45" Border.Lines="All">
         <TableColumn Name="Column22" Width="316.37"/>
         <TableColumn Name="Column23" Width="306.92"/>
         <TableRow Name="Row18" Height="35.15">
-          <TableCell Name="Cell120" Border.Lines="All" Text="委托部门（设备维修一部）" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell120" Border.Lines="All" Text="委托部门（[MainData.UnitName]）" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell121" Border.Lines="All" Text="热处理单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row19" Height="44.1">
@@ -191,6 +192,7 @@ namespace FastReport
           <TableCell Name="Cell131" Text="年  月  日   " HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
       </TableObject>
+      <TextObject Name="Text1" Top="113.4" Width="519.75" Height="37.8" Text="注：1.本委托单一式二份，一份委托部门自存，一份交热处理单位现场施工使用。&#13;&#10;2.热处理类别：消氢热处理、预热、后热、焊后热处理。&#13;&#10;" VertAlign="Center"/>
     </PageFooterBand>
   </ReportPage>
 </Report>

HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="11/23/2024 15:00:41" ReportInfo.Modified="09/02/2025 15:21:41" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="11/23/2024 15:00:41" ReportInfo.Modified="10/10/2025 08:56:59" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFosjZ/ejXg9zfJILxJtNSOA==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFYWFXLbIr+BdWSARr+sdz5Q==">
       <TableDataSource Name="Attach_Image" Alias="Data" DataType="System.Int32" Enabled="true" TableName="Attach_Image">
         <Column Name="Number" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="ISO_IsoNo" DataType="System.String" PropName="image_series"/>

HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊缝检测委托单.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="11/20/2024 09:40:31" ReportInfo.Modified="05/28/2025 15:16:50" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="11/20/2024 09:40:31" ReportInfo.Modified="10/10/2025 21:47:40" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -41,7 +41,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFVzlc1kQTT5OpMzXzDjutdQ==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFPz3ajaxZMvq2A8dZOM8eLw==">
       <TableDataSource Name="MainData" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="MainData">
         <Column Name="ProjectName" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="InstallastionName" DataType="System.String" PropName="image_series"/>
@@ -71,6 +71,7 @@ namespace FastReport
     </MsSqlDataConnection>
     <Parameter Name="JointCount" DataType="System.String"/>
     <Parameter Name="CheckCount" DataType="System.String"/>
+    <Parameter Name="pointDate" DataType="System.String"/>
   </Dictionary>
   <ReportPage Name="Page1" LeftMargin="25" TopMargin="20" RightMargin="20" BottomMargin="21" FirstPageSource="4" OtherPagesSource="4" Guides="0,623.64,159.97,30.24,89.96,398.65,32.51,39.77,85.13,77.57,66.53,81.27,479.54,70.01,313.52,241.24,557.11,273.75,623.26,623.36,155.84,311.68,467.52">
     <PageHeaderBand Name="PageHeader1" Width="623.7" Height="349.65" Guides="0,349.65,103.95,18.9,56.7,75.6,28.35,132.3,160.65,198.45,37.8,236.25,274.05,311.85">
@@ -292,10 +293,10 @@ namespace FastReport
           <TableCell Name="Cell239" Border.Lines="Left" Text="签字：" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row17" Height="26.46">
-          <TableCell Name="Cell241" Border.Lines="Right" Text="日期：" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell241" Border.Lines="Right" Text="日期：[pointDate]" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell242" Border.Lines="Right" Text="日期：" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell243" Text="日期：" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell244" Border.Lines="Left" Text="日期：" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell244" Border.Lines="Left" Text="日期：[pointDate]" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
       </TableObject>
     </PageFooterBand>

HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs

@@ -868,6 +868,13 @@ namespace FineUIPro.Web.HJGL.DataIn
                         if (getJoint == null)
                         {
                             newJointInfo.JOT_JointNo = col2;
+                            if (col8 == "固定")
+                            {
+                                if (newJointInfo.JOT_JointNo.Last() != 'G')
+                                {
+                                    newJointInfo.JOT_JointNo = newJointInfo.JOT_JointNo + "G";
+                                }
+                            }
                             newJointInfo.JOT_ID = SQLHelper.GetNewID(typeof(Model.HJGL_PW_JointInfo));
                             BLL.HJGL_PW_JointInfoService.AddJointInfo(newJointInfo);
                             // 更新排序字段

HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipeLineIn.aspx.cs

@@ -432,7 +432,7 @@ namespace FineUIPro.Web.HJGL.DataIn
                     }
                     if (getUnit != null && getProject != null)
                     {
-                        var getIsoInfo = isoInfos.FirstOrDefault(x => x.BSU_ID == getUnit.UnitId && x.ProjectId == getProject.ProjectId && x.ISO_IsoNo == col2);
+                        var getIsoInfo = isoInfos.FirstOrDefault(x => x.ProjectId == getProject.ProjectId && x.ISO_IsoNo == col2);
                         if (getIsoInfo != null)
                         {
                             result += "第" + (i + 2).ToString() + "行," + "该工艺管线已存在" + "\n";

HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs

@@ -648,7 +648,7 @@ namespace FineUIPro.Web.HJGL.DataIn
 
                 if (!string.IsNullOrEmpty(wmeCode))   //焊接方法
                 {
-                    if (wmeCode.Contains(welderQualify.WeldingMethodId))
+                    if (welderQualify.WeldingMethodId.Contains(wmeCode))
                     {
                         okNum++;
                     }

HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx

@@ -114,7 +114,7 @@
                     <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="热处理委托" EnableCollapse="true"
                         runat="server" BoxFlex="1" DataKeyNames="HotProessTrustItemId" AllowCellEditing="true"
                         AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="HotProessTrustItemId"
-                        AllowSorting="true" SortField="ISO_IsoNo,JOT_JointNo" SortDirection="ASC" OnSort="Grid1_Sort"
+                        AllowSorting="true" SortField="ISO_IsoNo,Sort1,Sort2,Sort3,Sort4,Sort5" SortDirection="ASC" OnSort="Grid1_Sort"
                         AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                         EnableTextSelection="True" AutoScroll="true">
                         <Toolbars>

HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs

@@ -676,6 +676,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
                 dt.Columns.Add("ProjectCode");
                 dt.Columns.Add("UnitName");
                 dt.Columns.Add("HotProessTrustCode");
+                dt.Columns.Add("ISO_DesignPress");
 
                 //DataView dv = tb.DefaultView;//获取表视图
                 //dv.Sort = "ISO_IsoNo,JOT_JointNo ASC";//按照ID倒序排序
@@ -688,12 +689,21 @@ namespace FineUIPro.Web.HJGL.HotProessManage
                     newRows["ProjectCode"] = row["ProjectCode"].ToString();
                     newRows["UnitName"] = row["UnitName"].ToString();
                     newRows["HotProessTrustCode"] = row["HotProessTrustCode"].ToString();
+                    newRows["ISO_DesignPress"] = row["ISO_DesignPress"].ToString();
                     dt.Rows.Add(newRows);
                 }
                 BLL.Common.FastReportService.AddFastreportTable(dt);
 
                 List<SqlParameter> listStr2 = new List<SqlParameter>();
                 listStr2.Add(new SqlParameter("@HotProessTrustId", this.HotProessTrustId));
+                if (drpProessTypes.SelectedValue != BLL.Const._Null)
+                {
+                    listStr2.Add(new SqlParameter("@ProessTypes", drpProessTypes.SelectedValue));
+                }
+                else
+                {
+                    listStr2.Add(new SqlParameter("@ProessTypes", null));
+                }
                 SqlParameter[] parameter2 = listStr2.ToArray();
                 DataTable tb2 = BLL.SQLHelper.GetDataTableRunProc("HJGL_spCH_HotProessTrustItem", parameter2);
 
@@ -707,7 +717,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
                 dt2.Columns.Add("ProessTypes");
 
                 DataView dv = tb2.DefaultView;//获取表视图
-                dv.Sort = "Number ASC";//按照ID倒序排序
+                dv.Sort = "ISO_IsoNo,JOT_JointNo ASC";//按照ID倒序排序
                 tb2 = dv.ToTable();//转为表
                 DataRow[] rows2 = tb2.DefaultView.ToTable().Select();
                 int i = 0;

HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchEdit.aspx.cs

@@ -371,6 +371,13 @@
                     {
                         try
                         {
+                            if (this.ddlJointAttribute.SelectedValue == "固定")
+                            {
+                                if (newJointInfo.JOT_JointNo.Last() != 'G')
+                                {
+                                    newJointInfo.JOT_JointNo = newJointInfo.JOT_JointNo + "G";
+                                }
+                            }
                             newJointInfo.JOT_ID = SQLHelper.GetNewID(typeof(Model.HJGL_PW_JointInfo));
                             BLL.HJGL_PW_JointInfoService.AddJointInfo(newJointInfo);
 

HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx

@@ -52,7 +52,7 @@
                         EnableEdit="true" LabelWidth="100px">
                     </f:DropDownList>
                     <f:DropDownList ID="ddlJointAttribute" Label="焊口属性" runat="server" ShowRedStar="true"
-                        Required="true" EnableEdit="true" LabelWidth="100px">
+                        Required="true" EnableEdit="true" LabelWidth="100px" AutoPostBack="true" OnSelectedIndexChanged="ddlJointAttribute_SelectedIndexChanged">
                     </f:DropDownList>
                     <f:DropDownList ID="ddlWME_ID" Label="焊接方法" runat="server" ShowRedStar="true" Required="true"
                         EnableEdit="true" LabelWidth="100px">

HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs

@@ -232,7 +232,7 @@
                             btnCopy.Enabled = false;   // 不能引用
                         }
                     }
-                    if (hotItems.Count() > 0 || batch.BatchIsClosed == true)  //存在热处理委托或者批关闭则不能修改焊口号
+                    if (batch != null && batch.BatchIsClosed == true)  //批关闭则不能修改焊口号
                     {
 
                     }
@@ -404,6 +404,20 @@
                 if (!string.IsNullOrEmpty(jointInfo.JOT_JointAttribute))
                 {
                     this.ddlJointAttribute.SelectedValue = jointInfo.JOT_JointAttribute;
+                    if (this.ddlJointAttribute.SelectedValue == "固定")
+                    {
+                        if (this.txtJointNo.Text.Trim().Last() != 'G')
+                        {
+                            this.txtJointNo.Text = this.txtJointNo.Text.Trim() + "G";
+                        }
+                    }
+                    else
+                    {
+                        if (this.txtJointNo.Text.Trim().Last() == 'G')
+                        {
+                            this.txtJointNo.Text = this.txtJointNo.Text.Trim().Replace("G", "");
+                        }
+                    }
                 }
                 if (!string.IsNullOrEmpty(jointInfo.WME_ID))
                 {
@@ -772,13 +786,13 @@
                     {
                         batchIsClosed = true;
                     }
-                    if (hotProessTrustItems.Count > 0 || batchIsClosed)  //存在热处理委托或者批关闭则不能修改焊口号
+                    if (batchIsClosed)  //存在热处理委托或者批关闭则不能修改焊口号
                     {
                         if (this.CurrUser.UserId != BLL.Const.GlyId)
                         {
                             if (newJointInfo.JOT_JointNo != jot.JOT_JointNo)
                             {
-                                Alert.ShowInTop("热处理已委托或者批关闭，不能修改焊口号！", MessageBoxIcon.Warning);
+                                Alert.ShowInTop("批关闭，不能修改焊口号！", MessageBoxIcon.Warning);
                                 return;
                             }
                         }
@@ -1216,5 +1230,23 @@
             }
         }
         #endregion
+
+        protected void ddlJointAttribute_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (this.ddlJointAttribute.SelectedValue == "固定")
+            {
+                if (this.txtJointNo.Text.Trim().Last() != 'G')
+                {
+                    this.txtJointNo.Text = this.txtJointNo.Text.Trim() + "G";
+                }
+            }
+            else
+            {
+                if (this.txtJointNo.Text.Trim().Last() == 'G')
+                {
+                    this.txtJointNo.Text = this.txtJointNo.Text.Trim().Replace("G", "");
+                }
+            }
+        }
     }
 }

HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs

@@ -480,7 +480,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
                 if (!string.IsNullOrEmpty(wmeCode))   //焊接方法
                 {
-                    if (wmeCode.Contains(welderQualify.WeldingMethodId))
+                    if (welderQualify.WeldingMethodId.Contains(wmeCode))
                     {
                         okNum++;
                     }

HJGL_DS/FineUIPro.Web/Web.config

@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="诺必达焊接管理系统"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx

@@ -34,7 +34,7 @@
                     <f:RenderField Width="180px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
                         HeaderText="所属单位" HeaderTextAlign="Center" TextAlign="Left" SortField="UnitName">
                     </f:RenderField>
-                    <f:RenderField Width="180px" ColumnID="UnitStoreCode" DataField="UnitStoreCode"
+                    <f:RenderField Width="80px" ColumnID="UnitStoreCode" DataField="UnitStoreCode"
                         FieldType="String" HeaderText="仓库编码" HeaderTextAlign="Center" TextAlign="Left"
                         SortField="UnitStoreCode">
                     </f:RenderField>
@@ -46,6 +46,7 @@
                         HeaderText="仓库位置" HeaderTextAlign="Center" TextAlign="Left" SortField="StorePosition"
                         ExpandUnusedSpace="true">
                     </f:RenderField>
+                    <f:CheckBoxField Width="80px" RenderAsStaticField="true" TextAlign="Center"  DataField="IsUsed" HeaderText="是否在用" />
                 </Columns>
                 <Listeners>
                     <f:Listener Event="rowselect" Handler="onGridRowSelect" />
@@ -82,6 +83,7 @@
                     <f:TextBox ID="txtStorePosition" Label="仓库位置"  runat="server"
                         LabelAlign="right" MaxLength="50">
                     </f:TextBox>
+                    <f:CheckBox runat="server" ID="cbIsUsed" Label="是否在用" LabelAlign="right"></f:CheckBox>
                 </Items>
                 <Toolbars>
                     <f:Toolbar ID="Toolbar1" Position="Top" runat="server">
@@ -136,6 +138,7 @@
         var txtUnitStoreCodeClientID = '<%= txtUnitStoreCode.ClientID %>';
         var txtUnitStoreNameClientID = '<%= txtUnitStoreName.ClientID %>';
         var txtStorePositionClientID = '<%= txtStorePosition.ClientID %>';
+        var cbIsUsedClientID = '<%= cbIsUsed.ClientID %>';
 
         function onGridRowSelect(event, rowId) {
             var grid = F(gridClientID);
@@ -152,6 +155,7 @@
             F(txtUnitStoreCodeClientID).setValue(rowValue['UnitStoreCode']);
             F(txtUnitStoreNameClientID).setValue(rowValue['UnitStoreName']);
             F(txtStorePositionClientID).setValue(rowValue['tStorePosition']);
+            F(cbIsUsedClientID).setValue(rowValue['IsUsed']);
 
             // 更新提交按钮文本
             F(btnSaveClientID).setText('提交数据（编辑）');

HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx.cs

@@ -51,7 +51,7 @@ namespace FineUIPro.Web.WeldMat.BaseInfo
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"SELECT s.UnitStoreId,s.UnitId,s.UnitStoreCode,s.UnitStoreName,s.StorePosition ,u.UnitName 
+            string strSql = @"SELECT s.UnitStoreId,s.UnitId,s.UnitStoreCode,s.UnitStoreName,s.StorePosition ,u.UnitName,s.IsUsed
                               FROM dbo.Weld_UnitStore s
                               LEFT JOIN dbo.Base_Unit u ON u.UnitId = s.UnitId
                               WHERE 1=1";
@@ -235,7 +235,10 @@ namespace FineUIPro.Web.WeldMat.BaseInfo
                 this.txtUnitStoreCode.Text = unitStore.UnitStoreCode;
                 this.txtUnitStoreName.Text = unitStore.UnitStoreName;
                 txtStorePosition.Text = unitStore.StorePosition;
-
+                if (unitStore.IsUsed == true)
+                {
+                    this.cbIsUsed.Checked = true;
+                }
                 hfFormID.Text = Id;
                 this.btnDelete.Enabled = true;
             }
@@ -269,6 +272,7 @@ namespace FineUIPro.Web.WeldMat.BaseInfo
                 store.UnitStoreCode = this.txtUnitStoreCode.Text.Trim();
                 store.UnitStoreName = this.txtUnitStoreName.Text.Trim();
                 store.StorePosition = txtStorePosition.Text.Trim();
+                store.IsUsed = this.cbIsUsed.Checked;
                 if (string.IsNullOrEmpty(strRowID))
                 {
                     var stores = BLL.UnitStoreService.GetUnitStoreByUnitId(drpUnitId.SelectedValue);

HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx.designer.cs

@@ -147,6 +147,15 @@ namespace FineUIPro.Web.WeldMat.BaseInfo {
         /// </remarks>
         protected global::FineUIPro.TextBox txtStorePosition;
         
+        /// <summary>
+        /// cbIsUsed 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox cbIsUsed;
+        
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>

HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx

@@ -20,7 +20,7 @@
         <Items>
             <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊材入库录入" EnableCollapse="true"
                 runat="server" BoxFlex="1" DataKeyNames="StockInId" AllowCellEditing="true" ClicksToEdit="2"
-                DataIDField="StockInId" AllowSorting="true" SortField="WeldName" SortDirection="ASC"
+                DataIDField="StockInId" AllowSorting="true" SortField="InStockDate" SortDirection="DESC"
                 OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="15"
                 OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange"
                 EnableTextSelection="True" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">

HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx

@@ -51,10 +51,12 @@
                     </f:TextBox>
                 </Items>
             </f:FormRow>
-            <f:FormRow>
+            <f:FormRow ColumnWidths="40% 10% 50%">
                 <Items>
-                     <f:NumberBox ID="txtWeight" runat="server" Label="重量(公斤)" LabelAlign="Right" NoNegative="true"  AutoPostBack="true" OnTextChanged="txtWeight_TextChanged">
+                     <f:NumberBox ID="txtWeight" runat="server" Label="重量(公斤)" LabelAlign="Right" NoNegative="true">
                     </f:NumberBox>
+                    <f:Button runat="server" ID="btnAmount" Icon="Calculator" Text="计算" OnClick="btnAmount_Click" ToolTip="计算焊材数量">
+                    </f:Button>
                     <f:NumberBox ID="txtAmount" runat="server" Label="数量(根)" LabelAlign="Right" NoNegative="true" AutoPostBack="true" OnTextChanged="txtAmount_TextChanged">
                     </f:NumberBox>   
                 </Items>

HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.cs

@@ -369,6 +369,30 @@ namespace FineUIPro.Web.WeldMat.Stock
             }
         }
 
+        protected void btnAmount_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.txtWeight.Text.Trim()))
+            {
+                if (!string.IsNullOrEmpty(this.hdWeldId.Text.Trim()))
+                {
+                    var weld = BLL.WeldInfoService.GetWeldInfoById(this.hdWeldId.Text.Trim());
+                    if (weld != null)
+                    {
+                        if (weld.ConvertValue.HasValue)
+                        {
+                            decimal? amountCov = Funs.GetNewDecimal(this.txtWeight.Text.Trim()) / weld.ConvertValue;
+                            int amount = Convert.ToInt32(Math.Floor(amountCov.Value));
+                            this.txtAmount.Text = amount.ToString();
+                        }
+                        else
+                        {
+                            this.txtAmount.Text = this.txtWeight.Text.Trim();
+                        }
+                    }
+                }
+            }
+        }
+
         protected void txtAmount_TextChanged(object sender, EventArgs e)
         {
             if (this.trRemainingAmount.Hidden == true)

HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.designer.cs

@@ -120,6 +120,15 @@ namespace FineUIPro.Web.WeldMat.Stock {
         /// </remarks>
         protected global::FineUIPro.NumberBox txtWeight;
         
+        /// <summary>
+        /// btnAmount 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAmount;
+        
         /// <summary>
         /// txtAmount 控件。
         /// </summary>

HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs

@@ -126,6 +126,17 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
                 strSql += " AND unit.UnitName LIKE @UnitName";
                 listStr.Add(new SqlParameter("@UnitName", "%" + this.txtUsingUnit.Text.Trim() + "%"));
             }
+            if (this.CurrUser.RoleId == BLL.Const.cgbgyId)
+            {
+                Model.Weld_Storeman storeMan = BLL.StoremanInfoService.GetStoremanByUserId(this.CurrUser.UserId);
+                string unitStoreId = string.Empty;
+                if (storeMan != null)
+                {
+                    unitStoreId = storeMan.UnitStoreId;
+                }
+                strSql += " AND UsingPlan.UnitStoreId = @UnitStoreId";
+                listStr.Add(new SqlParameter("@UnitStoreId", unitStoreId));
+            }
             //if (cbIsNeedConfirm.Checked)
             //{
             //    strSql += " AND UsingPlan.IsNeedConfirm = 1";

HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs

@@ -676,6 +676,16 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
             foreach (var q in qualifys)
             {
                 if (q.QualifiedProjectCode.Split('-').Length == 3)  //该种合格项目只能领盘状焊丝
+                {
+                    if (q.QualifiedProjectCode.Contains("SAW"))   
+                    {
+                        if (weldTypeId == "9770311b-af69-4b6f-b8ad-161a4df88015" || weldTypeId == "23900d2f-f0e6-4d76-a44d-eb47eede3914")  //SAW可以领用焊剂和盘装焊丝没有材质的限制
+                        {
+                            isPass = true;
+                            break; 
+                        }
+                    }
+                    else
                     {
                         if (weldTypeId == "23900d2f-f0e6-4d76-a44d-eb47eede3914")  //盘状焊丝
                         {
@@ -683,6 +693,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
                             break;
                         }
                     }
+                }
                 else
                 {
                     if (weldTypeId == "7f4261ef-70b4-4e5a-a5bb-623fc2eb190f" || weldTypeId == "56d933f6-8e6a-4761-80f4-c285662947cb")  //焊条和焊丝

HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx

@@ -94,9 +94,7 @@
                     <f:RenderField Width="80px" ColumnID="WeldSpec" DataField="WeldSpec" FieldType="String"
                         HeaderText="规格" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="UnitStoreName" DataField="UnitStoreName" FieldType="String"
+                    
-                        HeaderText="焊材库" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
                     <f:RenderField Width="150px" ColumnID="STE_Name" DataField="STE_Name" FieldType="String"
                         HeaderText="焊件材质" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField>
@@ -131,6 +129,9 @@
                      <%--<f:RenderField Width="100px" ColumnID="UnitStoreName" DataField="UnitStoreName" FieldType="String"
                         HeaderText="领用仓库" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField> --%>
+                    <f:RenderField Width="120px" ColumnID="UnitStoreName" DataField="UnitStoreName" FieldType="String"
+                        HeaderText="焊材库" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
                     <f:LinkButtonField ID="lbtnUrl" HeaderText="签名" Icon="ApplicationEdit" Width="80px" CommandName="url" ColumnID="Url"
                         HeaderTextAlign="Center" TextAlign="Center" ToolTip="显示签名" />
                     <f:LinkButtonField ID="lbtnPrint" HeaderText="打印" Icon="Printer" Width="80px" CommandName="print"

HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx

@@ -22,6 +22,7 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
                             <Items>
+                                <f:DropDownList ID="drpUnitStoreId" runat="server" Label="单位仓库" LabelAlign="Right"></f:DropDownList>
                                 <f:DatePicker ID="txtStartDate" runat="server" Label="记录日期" EmptyText="开始时间" Width="220px" LabelAlign="Right"></f:DatePicker>
                                 <f:Label ID="Label1" runat="server" Text="-"></f:Label>
                                 <f:DatePicker ID="txtEndDate" runat="server" EmptyText="结束时间" Width="120px"></f:DatePicker>

HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.cs

@@ -23,7 +23,7 @@ namespace FineUIPro.Web.WeldMat.WeldMatDataBase
             if (!IsPostBack)
             {
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-
+                BLL.UnitStoreService.InitUnitStoreDropDownList(drpUnitStoreId, null, true);
                 // 绑定表格
                 BindGrid();
             }
@@ -44,7 +44,11 @@ namespace FineUIPro.Web.WeldMat.WeldMatDataBase
                               LEFT JOIN dbo.Weld_UnitStore store ON store.UnitStoreId=TemperatureAndHumidity.UnitStoreId
                               WHERE 1=1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
-
+            if (this.drpUnitStoreId.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND TemperatureAndHumidity.UnitStoreId = @unitStoreId";
+                listStr.Add(new SqlParameter("@unitStoreId", drpUnitStoreId.SelectedValue));
+            }
             if (!string.IsNullOrEmpty(this.txtRecordMan.Text.Trim()))
             {
                 strSql += " AND TemperatureAndHumidity.RecordMan LIKE @RecordMan";

HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.designer.cs

@@ -57,6 +57,15 @@ namespace FineUIPro.Web.WeldMat.WeldMatDataBase {
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
         
+        /// <summary>
+        /// drpUnitStoreId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnitStoreId;
+        
         /// <summary>
         /// txtStartDate 控件。
         /// </summary>

HJGL_DS/Model/Model.cs

@@ -59872,6 +59872,16 @@ namespace Model
 		
 		private string _ProjectId;
 		
+		private string _Sort1;
+		
+		private System.Nullable<int> _Sort2;
+		
+		private string _Sort3;
+		
+		private System.Nullable<int> _Sort4;
+		
+		private System.Nullable<int> _Sort5;
+		
 		private string _WME_Code;
 		
 		private string _WED_Code;
@@ -59880,6 +59890,8 @@ namespace Model
 		
 		private System.Nullable<bool> _IsOK;
 		
+		private string _ISO_DesignPress;
+		
 		public HJGL_View_CH_HotProessTrustItem()
 		{
 		}
@@ -60220,6 +60232,86 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort1", DbType="VarChar(10)")]
+		public string Sort1
+		{
+			get
+			{
+				return this._Sort1;
+			}
+			set
+			{
+				if ((this._Sort1 != value))
+				{
+					this._Sort1 = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort2", DbType="Int")]
+		public System.Nullable<int> Sort2
+		{
+			get
+			{
+				return this._Sort2;
+			}
+			set
+			{
+				if ((this._Sort2 != value))
+				{
+					this._Sort2 = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort3", DbType="VarChar(10)")]
+		public string Sort3
+		{
+			get
+			{
+				return this._Sort3;
+			}
+			set
+			{
+				if ((this._Sort3 != value))
+				{
+					this._Sort3 = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort4", DbType="Int")]
+		public System.Nullable<int> Sort4
+		{
+			get
+			{
+				return this._Sort4;
+			}
+			set
+			{
+				if ((this._Sort4 != value))
+				{
+					this._Sort4 = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort5", DbType="Int")]
+		public System.Nullable<int> Sort5
+		{
+			get
+			{
+				return this._Sort5;
+			}
+			set
+			{
+				if ((this._Sort5 != value))
+				{
+					this._Sort5 = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WME_Code", DbType="VarChar(20)")]
 		public string WME_Code
 		{
@@ -60283,6 +60375,22 @@ namespace Model
 				}
 			}
 		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ISO_DesignPress", DbType="NVarChar(13)")]
+		public string ISO_DesignPress
+		{
+			get
+			{
+				return this._ISO_DesignPress;
+			}
+			set
+			{
+				if ((this._ISO_DesignPress != value))
+				{
+					this._ISO_DesignPress = value;
+				}
+			}
+		}
 	}
 	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_View_CH_RepairItemRecord")]
@@ -111657,6 +111765,8 @@ namespace Model
 		
 		private string _StorePosition;
 		
+		private System.Nullable<bool> _IsUsed;
+		
 		private EntitySet<HJGL_BakeRecordsProject> _HJGL_BakeRecordsProject;
 		
 		private EntitySet<HJGL_TemperatureAndHumidity> _HJGL_TemperatureAndHumidity;
@@ -111681,6 +111791,8 @@ namespace Model
     partial void OnUnitStoreNameChanged();
     partial void OnStorePositionChanging(string value);
     partial void OnStorePositionChanged();
+    partial void OnIsUsedChanging(System.Nullable<bool> value);
+    partial void OnIsUsedChanged();
     #endregion
 		
 		public Weld_UnitStore()
@@ -111797,6 +111909,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUsed", DbType="Bit")]
+		public System.Nullable<bool> IsUsed
+		{
+			get
+			{
+				return this._IsUsed;
+			}
+			set
+			{
+				if ((this._IsUsed != value))
+				{
+					this.OnIsUsedChanging(value);
+					this.SendPropertyChanging();
+					this._IsUsed = value;
+					this.SendPropertyChanged("IsUsed");
+					this.OnIsUsedChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_BakeRecordsProject_Weld_UnitStore", Storage="_HJGL_BakeRecordsProject", ThisKey="UnitStoreId", OtherKey="UnitStoreId", DeleteRule="NO ACTION")]
 		public EntitySet<HJGL_BakeRecordsProject> HJGL_BakeRecordsProject
 		{

HJGL_DS/WebAPI/Controllers/JointInfoController.cs

@@ -237,7 +237,7 @@ namespace WebAPI.Controllers
 
                 if (!string.IsNullOrEmpty(wmeCode))   //焊接方法
                 {
-                    if (wmeCode.Contains(welderQualify.WeldingMethodId))
+                    if (welderQualify.WeldingMethodId.Contains(wmeCode))
                     {
                         okNum++;
                     }

HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -79,13 +79,13 @@
       <publishTime>09/10/2013 16:29:20</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>09/01/2025 17:47:50</publishTime>
+      <publishTime>09/16/2025 14:44:43</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
       <publishTime>07/28/2025 20:15:00</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>09/01/2025 17:47:50</publishTime>
+      <publishTime>09/16/2025 14:44:43</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/17/2020 21:32:28</publishTime>
@@ -115,10 +115,10 @@
       <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>09/01/2025 17:47:50</publishTime>
+      <publishTime>09/16/2025 14:44:43</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>09/01/2025 17:47:50</publishTime>
+      <publishTime>09/16/2025 14:44:43</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>03/17/2021 20:03:36</publishTime>
@@ -319,10 +319,10 @@
       <publishTime>02/01/2018 12:20:56</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>09/01/2025 17:47:51</publishTime>
+      <publishTime>09/16/2025 14:44:44</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>09/01/2025 17:47:51</publishTime>
+      <publishTime>09/16/2025 14:44:44</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>01/23/2014 13:57:34</publishTime>
@@ -448,7 +448,7 @@
       <publishTime>07/03/2024 11:01:07</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>09/01/2025 17:48:01</publishTime>
+      <publishTime>09/16/2025 14:44:50</publishTime>
     </File>
   </ItemGroup>
 </Project>