shecs
/
Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

111

This commit is contained in:
佘春生 2024-05-13 11:09:28 +08:00
parent f5e0d8eae7 5f4dbc6112
commit be53128865
10 changed files with 52 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
CreateModel.bat
View File

@ -1,33 +0,0 @@
@echo off
REM ---------------
REM 发布包生成工具
REM 执行此文件前请先用Release生成WebOA项目
REM --------------
REM --------------
REM 环境变量设置 Project_Src为如WebOA这样的分支
REM --------------
set PROJECT_SRC=%CD%
cd..
REM 源代码Model项目文件夹
set Model_ROOT=%PROJECT_SRC%\HJGL\Model
REM --------------
REM 发布程序包文件夹相关
REM --------------
@echo 设置.net控制台环境
@echo.
@call "%VS100COMNTOOLS%"vsvars32.bat
SqlMetal /views /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
@ECHO 完成
pause

3
HJGL/BLL/WeldingProcess/PMI/PMIDelegation_Service.cs
View File

@ -36,7 +36,8 @@ namespace BLL
newItem.Status = 0; newItem.Status = 0;
newItem.PMIId = string.Empty; newItem.PMIId = string.Empty;
newItem.WorkAreaId = jotInfo.WorkAreaId; newItem.WorkAreaId = jotInfo.WorkAreaId;
newItem.CreatedTime = DateTime.Now; newItem.CheckTime = DateTime.Now;
newItem.ReportTime= DateTime.Now;
newItem.DelegationDate= DateTime.Now; newItem.DelegationDate= DateTime.Now;
newItem.DelegationNo = string.Empty; newItem.DelegationNo = string.Empty;
returnViewMatch.Add(newItem); returnViewMatch.Add(newItem);

2
HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs generated
View File

@ -1231,7 +1231,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 检测日期 的本地化字符串。 /// 查找类似 委托日期 的本地化字符串。
/// </summary> /// </summary>
internal static string DelegationDate { internal static string DelegationDate {
get { get {

2
HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx
View File

@ -2107,7 +2107,7 @@
<value>首页</value> <value>首页</value>
</data> </data>
<data name="DelegationDate" xml:space="preserve"> <data name="DelegationDate" xml:space="preserve">
<value>检测日期</value> <value>委托日期</value>
</data> </data>
<data name="DetectionMethod" xml:space="preserve"> <data name="DetectionMethod" xml:space="preserve">
<value>检测方法</value> <value>检测方法</value>

4
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx
View File

@ -139,8 +139,8 @@
DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center" DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="120px"> TextAlign="Center" Width="120px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,TrustDate %>" ColumnID="CreatedTime" <f:RenderField HeaderText="<%$ Resources:Lan,TrustDate %>" ColumnID="DelegationDate"
DataField="CreatedTime" SortField="CreatedTime" FieldType="Date" Renderer="Date" DataField="DelegationDate" SortField="DelegationDate" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="120px"> HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,QualityNo %>" ColumnID="QualityNo" DataField="QualityNo" <f:RenderField HeaderText="<%$ Resources:Lan,QualityNo %>" ColumnID="QualityNo" DataField="QualityNo"

3
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
View File

@ -350,7 +350,8 @@ namespace FineUIPro.Web.WeldingProcess.PMI
newTrustItem.Acceptance = values.Value<string>("Acceptance").ToString(); newTrustItem.Acceptance = values.Value<string>("Acceptance").ToString();
newTrustItem.QualityNo = values.Value<string>("QualityNo").ToString(); newTrustItem.QualityNo = values.Value<string>("QualityNo").ToString();
newTrustItem.Status = 0; newTrustItem.Status = 0;
newTrustItem.CreatedTime = DateTime.Now; newTrustItem.CheckTime = DateTime.Now;
newTrustItem.ReportTime = DateTime.Now;
newTrustItem.PMIId = this.PMIDelegationId; newTrustItem.PMIId = this.PMIDelegationId;
listData.Add(newTrustItem); listData.Add(newTrustItem);
} }

24
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx
View File

@ -95,9 +95,9 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:Label ID="txtTabler" Label="<%$ Resources:Lan,Lister %>" runat="server" LabelAlign="Right" <f:Label ID="txtTabler" Label="<%$ Resources:Lan,Lister %>" runat="server" LabelAlign="Right"
LabelWidth="170px"> LabelWidth="170px">
</f:Label> </f:Label>
<f:Label ID="txtRemark" Label="<%$ Resources:Lan,Remark %>" runat="server" LabelAlign="Right" <f:Label ID="txtRemark" Label="<%$ Resources:Lan,Remark %>" runat="server" LabelAlign="Right"
LabelWidth="170px"> LabelWidth="170px">
</f:Label> </f:Label>
@ -152,20 +152,20 @@
DataField="Acceptance" FieldType="String" TextAlign="Left" Width="150px"> DataField="Acceptance" FieldType="String" TextAlign="Left" Width="150px">
</f:RenderField> </f:RenderField>
<%-- 检测日期 --%> <%-- 检测日期 --%>
<f:RenderField HeaderText="<%$ Resources:Lan,FilmDate %>" ColumnID="DelegationDate" <f:RenderField HeaderText="<%$ Resources:Lan,FilmDate %>" ColumnID="checkTime"
DataField="DelegationDate" SortField="DelegationDate" FieldType="Date" Renderer="Date" DataField="checkTime" RendererArgument="yyyy-MM-dd" SortField="checkTime" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="120px"> HeaderTextAlign="Center" TextAlign="Left" Width="120px">
<Editor> <Editor>
<f:DatePicker ID="tbxTrustDate" DateFormatString="yyyy-MM-dd" Required="true" runat="server"> <f:DatePicker ID="tbxTrustDate" Required="true" runat="server">
</f:DatePicker> </f:DatePicker>
</Editor> </Editor>
</f:RenderField> </f:RenderField>
<%-- 报告日期 --%> <%-- 报告日期 --%>
<f:RenderField HeaderText="<%$ Resources:Lan,ReportDate %>" ColumnID="CreatedTime" <f:RenderField HeaderText="<%$ Resources:Lan,ReportDate %>" ColumnID="reportTime"
DataField="CreatedTime" SortField="CreatedTime" FieldType="Date" Renderer="Date" DataField="reportTime" RendererArgument="yyyy-MM-dd" SortField="reportTime" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="120px"> HeaderTextAlign="Center" TextAlign="Left" Width="120px">
<Editor> <Editor>
<f:DatePicker ID="tbxCreatedTime" DateFormatString="yyyy-MM-dd" Required="true" runat="server"> <f:DatePicker ID="tbxreportTime" Required="true" runat="server">
</f:DatePicker> </f:DatePicker>
</Editor> </Editor>
</f:RenderField> </f:RenderField>
@ -183,9 +183,9 @@
DataField="StatusText" SortField="StatusText" FieldType="String" HeaderTextAlign="Center" DataField="StatusText" SortField="StatusText" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px"> TextAlign="Left" Width="100px">
<Editor> <Editor>
<f:DropDownList ID="drpstatus" runat="server" ShowRedStar="true" Required="true" > <f:DropDownList ID="drpstatus" runat="server" ShowRedStar="true" Required="true">
<f:ListItem Value="合格" Text="合格" /> <f:ListItem Value="合格" Text="合格" />
<f:ListItem Value="不合格" Text="不合格" /> <f:ListItem Value="不合格" Text="不合格" />
</f:DropDownList> </f:DropDownList>
</Editor> </Editor>
</f:RenderField> </f:RenderField>

21
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs
View File

@ -197,12 +197,13 @@ namespace FineUIPro.Web.WeldingProcess.PMI
private void PageInfoLoad() private void PageInfoLoad()
{ {
this.SimpleForm1.Reset(); ///重置所有字段 this.SimpleForm1.Reset(); ///重置所有字段
var pageInfo = (from x in Funs.DB.PMI_Delegation var pageInfo = (from x in Funs.DB.PMI_Delegation
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
join n in Funs.DB.Project_Installation on x.InstallationId equals n.InstallationId join n in Funs.DB.Project_Installation on x.InstallationId equals n.InstallationId
join u in Funs.DB.Sys_User on x.DetectionStandard equals u.UserId into u1 //左连接查询 join u in Funs.DB.Sys_User on x.DetectionStandard equals u.UserId into u1 //左连接查询
from u in u1.DefaultIfEmpty() from u in u1.DefaultIfEmpty()
where x.Id == hdPMIId.Text where x.Id == this.PMIID
select new select new
{ {
DelegationNo = x.DelegationNo, DelegationNo = x.DelegationNo,
@ -221,7 +222,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
this.txtInstallationName.Text = pageInfo[0].InstallationName; this.txtInstallationName.Text = pageInfo[0].InstallationName;
this.txtUnitName.Text = pageInfo[0].UnitName; this.txtUnitName.Text = pageInfo[0].UnitName;
this.txtDetectionMethod.Text = pageInfo[0].DetectionMethod; this.txtDetectionMethod.Text = pageInfo[0].DetectionMethod;
this.txtTabler.Text = pageInfo[0].Tabler; this.txtTabler.Text = BLL.Sys_UserService.GetUserNameByUserId(pageInfo[0].Tabler);
this.txtRemark.Text = pageInfo[0].Remark; this.txtRemark.Text = pageInfo[0].Remark;
this.txtDetectionStandard.Text = pageInfo[0].DetectionStandard; this.txtDetectionStandard.Text = pageInfo[0].DetectionStandard;
} }
@ -349,17 +350,17 @@ namespace FineUIPro.Web.WeldingProcess.PMI
if (onePMIDelegationDetails == null) if (onePMIDelegationDetails == null)
continue; continue;
//检测日期(缺失) //检测日期(缺失)
string DelegationDate = values.Value<string>("DelegationDate"); string checkTime = values.Value<string>("checkTime");
if (string.IsNullOrWhiteSpace(DelegationDate)) if (string.IsNullOrWhiteSpace(checkTime))
; onePMIDelegationDetails.CheckTime = null;
else else
; onePMIDelegationDetails.CheckTime = Convert.ToDateTime(checkTime);
//报告日期 //报告日期
string createdTime = values.Value<string>("CreatedTime"); string reportTime = values.Value<string>("reportTime");
if (string.IsNullOrWhiteSpace(createdTime)) if (string.IsNullOrWhiteSpace(reportTime))
onePMIDelegationDetails.CreatedTime=null; onePMIDelegationDetails.ReportTime = null;
else else
onePMIDelegationDetails.CreatedTime=Convert.ToDateTime(createdTime); onePMIDelegationDetails.ReportTime = Convert.ToDateTime(reportTime);
//报告编号 //报告编号
onePMIDelegationDetails.ReportNo = values.Value<string>("reportNo").ToString(); onePMIDelegationDetails.ReportNo = values.Value<string>("reportNo").ToString();
//是否合格 0合格 1不合格 //是否合格 0合格 1不合格

4
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs generated
View File

@ -267,13 +267,13 @@ namespace FineUIPro.Web.WeldingProcess.PMI
protected global::FineUIPro.DatePicker tbxTrustDate; protected global::FineUIPro.DatePicker tbxTrustDate;
/// <summary> /// <summary>
/// tbxCreatedTime 控件。 /// tbxreportTime 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DatePicker tbxCreatedTime; protected global::FineUIPro.DatePicker tbxreportTime;
/// <summary> /// <summary>
/// tbxreportNo 控件。 /// tbxreportNo 控件。

21
HJGLPackFile/版本日志/HJGLDB_2024.05.12.sql
View File

@ -255,13 +255,30 @@ GO
/*******PMIίÍÐÃ÷ϸÊÓͼ***********/ /*******PMIίÍÐÃ÷ϸÊÓͼ***********/
USE [HJGLDB_ZJBSF]
GO
/****** Object: View [dbo].[View_PMI_DelegationDetails] Script Date: 2024-5-13 9:06:44 ******/
SET ANSI_NULLS ON
GO
SET QUOTED_IDENTIFIER ON
GO
alter table PMI_DelegationDetails add reportTime datetime
ALTER VIEW [dbo].[View_PMI_DelegationDetails] ALTER VIEW [dbo].[View_PMI_DelegationDetails]
AS AS
/********热处理明细********/ /********PMI处理明细********/
SELECT SELECT
TrustItem.Id, TrustItem.Id,
TrustItem.Acceptance, TrustItem.Acceptance,
TrustItem.CreatedTime, TrustItem.checkTime,
TrustItem.reportTime,
TrustItem.JointId as WeldJointId, TrustItem.JointId as WeldJointId,
TrustItem.status, TrustItem.status,
TrustItem.QualityNo, TrustItem.QualityNo,