diff --git a/DataBase/版本日志/HJGLDB_DS_2025-09-15_gf.sql b/DataBase/版本日志/HJGLDB_DS_2025-09-15_gf.sql new file mode 100644 index 0000000..a0c93e8 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/DataBase/版本日志/HJGLDB_DS_2025-09-25_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2025-09-25_bwj.sql new file mode 100644 index 0000000..0288be3 --- /dev/null +++ b/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 + diff --git a/DataBase/版本日志/HJGLDB_DS_2025-10-10_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2025-10-10_bwj.sql new file mode 100644 index 0000000..3c3a8b2 --- /dev/null +++ b/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 + + diff --git a/DataBase/版本日志/HJGLDB_DS_2025-10-12_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2025-10-12_bwj.sql new file mode 100644 index 0000000..fb375c5 --- /dev/null +++ b/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 + + diff --git a/DataBase/版本日志/HJGLDB_DS_2025-10-12_gf.sql b/DataBase/版本日志/HJGLDB_DS_2025-10-12_gf.sql new file mode 100644 index 0000000..aebd4b3 --- /dev/null +++ b/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 + + diff --git a/DataBase/版本日志/HJGLDB_DS_2025-10-14_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2025-10-14_bwj.sql new file mode 100644 index 0000000..a83199b --- /dev/null +++ b/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 \ No newline at end of file diff --git a/HJGL_DS/BLL/WeldMat/BaseInfo/UnitStoreService.cs b/HJGL_DS/BLL/WeldMat/BaseInfo/UnitStoreService.cs index c74a795..5434127 100644 --- a/HJGL_DS/BLL/WeldMat/BaseInfo/UnitStoreService.cs +++ b/HJGL_DS/BLL/WeldMat/BaseInfo/UnitStoreService.cs @@ -5,7 +5,7 @@ using System.Text; namespace BLL { - public static class UnitStoreService + public static class UnitStoreService { /// /// 根据主键获取单位仓库 @@ -19,7 +19,7 @@ namespace BLL public static List GetUnitStoreByUnitId(string unitId) { - return Funs.DB.Weld_UnitStore.Where(e => e.UnitId==unitId).ToList(); + return Funs.DB.Weld_UnitStore.Where(e => e.UnitId == unitId).ToList(); } /// @@ -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)) @@ -146,7 +149,7 @@ namespace BLL string name = string.Empty; var store = from x in Funs.DB.Weld_UnitStore join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId - where x.UnitStoreId== unitStoreId + where x.UnitStoreId == unitStoreId orderby y.UnitName, x.UnitStoreCode select new { x.UnitStoreId, UnitStoreName = (y.UnitName + "(" + x.UnitStoreName + ")"), y.UnitName, x.UnitId }; if (store.Count() > 0) diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs index a3139d6..2092eca 100644 --- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs +++ b/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 keyValuePairs = new Dictionary(); 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"; diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs index 06ee3a7..085f261 100644 --- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs +++ b/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 listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", ProjectId)); diff --git a/HJGL_DS/FineUIPro.Web/ErrLog.txt b/HJGL_DS/FineUIPro.Web/ErrLog.txt index ef7802c..5f28270 100644 --- a/HJGL_DS/FineUIPro.Web/ErrLog.txt +++ b/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 - + \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx index a29fe2a..d0e8706 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,12 +42,13 @@ namespace FastReport } - + + @@ -59,9 +60,9 @@ namespace FastReport - - - + + + @@ -69,7 +70,7 @@ namespace FastReport - + @@ -92,8 +93,8 @@ namespace FastReport - - + + @@ -110,31 +111,31 @@ namespace FastReport - + - + - - + + - - - + + + - + @@ -146,14 +147,14 @@ namespace FastReport - - + + - - + + @@ -174,12 +175,12 @@ namespace FastReport - + - + @@ -191,6 +192,7 @@ namespace FastReport + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx index b39a8c5..ce68404 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊缝检测委托单.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊缝检测委托单.frx index 31cf295..00a933b 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊缝检测委托单.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊缝检测委托单.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -41,7 +41,7 @@ namespace FastReport } - + @@ -71,6 +71,7 @@ namespace FastReport + @@ -292,10 +293,10 @@ namespace FastReport - + - + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs index 4841395..d58e176 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs +++ b/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); // 更新排序字段 diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipeLineIn.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipeLineIn.aspx.cs index 595846b..58b62cd 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipeLineIn.aspx.cs +++ b/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"; diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs index 6015f74..ab19e6d 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs +++ b/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++; } diff --git a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx index a784650..8cb24d2 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx @@ -114,7 +114,7 @@ diff --git a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs index 9132ddb..5fe9190 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs +++ b/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 listStr2 = new List(); 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; diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchEdit.aspx.cs index e7dfce5..36a0af1 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchEdit.aspx.cs +++ b/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); diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx index c286007..84e1496 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx @@ -52,7 +52,7 @@ EnableEdit="true" LabelWidth="100px"> + Required="true" EnableEdit="true" LabelWidth="100px" AutoPostBack="true" OnSelectedIndexChanged="ddlJointAttribute_SelectedIndexChanged"> diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs index b8f74e0..c8e4f6e 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs +++ b/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", ""); + } + } + } } } \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs index 7933242..1325755 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs +++ b/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++; } diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index e233efb..5c46a5b 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx index ec59e34..bc56432 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx +++ b/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx @@ -34,7 +34,7 @@ - @@ -46,6 +46,7 @@ HeaderText="仓库位置" HeaderTextAlign="Center" TextAlign="Left" SortField="StorePosition" ExpandUnusedSpace="true"> + @@ -82,6 +83,7 @@ + @@ -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('提交数据（编辑）'); diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx.cs index 813f568..153b9f7 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx.cs @@ -51,7 +51,7 @@ namespace FineUIPro.Web.WeldMat.BaseInfo /// 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); diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx.designer.cs index 7ec49ec..44532bb 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx.designer.cs @@ -147,6 +147,15 @@ namespace FineUIPro.Web.WeldMat.BaseInfo { /// protected global::FineUIPro.TextBox txtStorePosition; + /// + /// cbIsUsed 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox cbIsUsed; + /// /// Toolbar1 控件。 /// diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx index 1f68beb..644abdf 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx +++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx @@ -20,7 +20,7 @@ diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx index c7c37a7..e05784d 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx +++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx @@ -51,10 +51,12 @@ - + - + + + diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.cs index e927895..f0373f5 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.cs +++ b/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) diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.designer.cs index 3b2de18..cfc827b 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.designer.cs @@ -120,6 +120,15 @@ namespace FineUIPro.Web.WeldMat.Stock { /// protected global::FineUIPro.NumberBox txtWeight; + /// + /// btnAmount 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAmount; + /// /// txtAmount 控件。 /// diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs index ba7f0b4..e3502d2 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs +++ b/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"; diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs index d4b4603..8969437 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs @@ -677,10 +677,21 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { if (q.QualifiedProjectCode.Split('-').Length == 3) //该种合格项目只能领盘状焊丝 { - if (weldTypeId == "23900d2f-f0e6-4d76-a44d-eb47eede3914") //盘状焊丝 + if (q.QualifiedProjectCode.Contains("SAW")) { - isPass = true; - break; + 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") //盘状焊丝 + { + isPass = true; + break; + } } } else diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx index 35813ae..aa5ff29 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx @@ -94,9 +94,7 @@ - - + @@ -131,6 +129,9 @@ <%-- --%> + + + diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.cs index 00a4c3f..e1e97e2 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.cs +++ b/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 listStr = new List(); - + 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"; diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.designer.cs index d829df0..463b77c 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.designer.cs @@ -57,6 +57,15 @@ namespace FineUIPro.Web.WeldMat.WeldMatDataBase { /// protected global::FineUIPro.Toolbar Toolbar2; + /// + /// drpUnitStoreId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitStoreId; + /// /// txtStartDate 控件。 /// diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs index 9d41933..a484531 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -59872,6 +59872,16 @@ namespace Model private string _ProjectId; + private string _Sort1; + + private System.Nullable _Sort2; + + private string _Sort3; + + private System.Nullable _Sort4; + + private System.Nullable _Sort5; + private string _WME_Code; private string _WED_Code; @@ -59880,6 +59890,8 @@ namespace Model private System.Nullable _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 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 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 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 _IsUsed; + private EntitySet _HJGL_BakeRecordsProject; private EntitySet _HJGL_TemperatureAndHumidity; @@ -111681,6 +111791,8 @@ namespace Model partial void OnUnitStoreNameChanged(); partial void OnStorePositionChanging(string value); partial void OnStorePositionChanged(); + partial void OnIsUsedChanging(System.Nullable 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 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 { diff --git a/HJGL_DS/WebAPI/Controllers/JointInfoController.cs b/HJGL_DS/WebAPI/Controllers/JointInfoController.cs index 16c9739..2d8bfee 100644 --- a/HJGL_DS/WebAPI/Controllers/JointInfoController.cs +++ b/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++; } diff --git a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index 80f6370..6cdfcee 100644 --- a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -79,13 +79,13 @@ 09/10/2013 16:29:20 - 09/01/2025 17:47:50 + 09/16/2025 14:44:43 07/28/2025 20:15:00 - 09/01/2025 17:47:50 + 09/16/2025 14:44:43 12/17/2020 21:32:28 @@ -115,10 +115,10 @@ 07/25/2012 11:48:56 - 09/01/2025 17:47:50 + 09/16/2025 14:44:43 - 09/01/2025 17:47:50 + 09/16/2025 14:44:43 03/17/2021 20:03:36 @@ -319,10 +319,10 @@ 02/01/2018 12:20:56 - 09/01/2025 17:47:51 + 09/16/2025 14:44:44 - 09/01/2025 17:47:51 + 09/16/2025 14:44:44 01/23/2014 13:57:34 @@ -448,7 +448,7 @@ 07/03/2024 11:01:07 - 09/01/2025 17:48:01 + 09/16/2025 14:44:50 \ No newline at end of file