lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
高飞
2023-11-24 12:11:42 +08:00
parent 31d0b92b8f
commit 98701b3991
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_V2023-11-24.sql
+1 -1
View File
@@ -10,7 +10,7 @@ CREATE PROC [dbo].[sp_rpt_CheckResult]
AS 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 case ndeItem.CheckResult when '1' then '合格' else '不合格' end as CheckResult,pipeline.FlowingSection
from HJGL_Batch_NDEItem ndeItem from HJGL_Batch_NDEItem ndeItem
LEFT JOIN dbo.Base_DetectionType detectionType ON detectionType.DetectionTypeId = ndeItem.DetectionTypeId LEFT JOIN dbo.Base_DetectionType detectionType ON detectionType.DetectionTypeId = ndeItem.DetectionTypeId
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+1 -1
View File
@@ -1015,7 +1015,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
#region 查找 #region 查找
protected void WeldingDateText_OnTextChanged(object sender, EventArgs e) 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); this.txtWeldingDailyCode.Text = BLL.SQLHelper.RunProcNewId("SpGetThreeNumber", "dbo.HJGL_WeldingDaily", "WeldingDailyCode", this.CurrUser.LoginProjectId, perfix);
BindGrid(null); BindGrid(null);
} }
SGGL/FineUIPro.Web/HJGL/WeldingReport/CheckResult.aspx
+3 -3
View File
@@ -14,9 +14,9 @@
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch"> ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊工一次合格率" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊工一次合格率"
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="WeldJointCode" EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="NDEItemID"
AllowCellEditing="true" ClicksToEdit="2" DataIDField="WeldJointCode" AllowSorting="true" AllowCellEditing="true" ClicksToEdit="2" DataIDField="NDEItemID" AllowSorting="true"
SortField="WeldJointCode" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" ForceFit="true" SortField="UnitName" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" ForceFit="true"
IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True"> EnableTextSelection="True">
<Toolbars> <Toolbars>