diff --git a/DataBase/版本日志/SGGLDB_V2023-11-24.sql b/DataBase/版本日志/SGGLDB_V2023-11-24.sql index fa8b1feb..880c945c 100644 --- a/DataBase/版本日志/SGGLDB_V2023-11-24.sql +++ b/DataBase/版本日志/SGGLDB_V2023-11-24.sql @@ -10,7 +10,7 @@ CREATE PROC [dbo].[sp_rpt_CheckResult] AS /**/ -select unit.UnitName,jot.WeldJointCode,detectionType.DetectionTypeCode,ndeItem.TotalFilm,ndeItem.PassFilm, +select ndeItem.NDEItemID,unit.UnitName,jot.WeldJointCode,detectionType.DetectionTypeCode,ndeItem.TotalFilm,ndeItem.PassFilm, case ndeItem.CheckResult when '1' then 'ϸ' else 'ϸ' end as CheckResult,pipeline.FlowingSection from HJGL_Batch_NDEItem ndeItem LEFT JOIN dbo.Base_DetectionType detectionType ON detectionType.DetectionTypeId = ndeItem.DetectionTypeId diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs index 02111680..e6a9690c 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs @@ -1015,7 +1015,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage #region 查找 protected void WeldingDateText_OnTextChanged(object sender, EventArgs e) { - string perfix = string.Format("{0:yyyyMMdd}", System.DateTime.Now) + "-"; + string perfix = string.Format("{0:yyyyMMdd}", Funs.GetNewDateTimeOrNow(this.txtWeldingDate.Text.Trim())) + "-"; this.txtWeldingDailyCode.Text = BLL.SQLHelper.RunProcNewId("SpGetThreeNumber", "dbo.HJGL_WeldingDaily", "WeldingDailyCode", this.CurrUser.LoginProjectId, perfix); BindGrid(null); } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/CheckResult.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingReport/CheckResult.aspx index ea731487..7940e9b5 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/CheckResult.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/CheckResult.aspx @@ -14,9 +14,9 @@ ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">