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

11

This commit is contained in:
佘春生 2024-05-17 15:13:24 +08:00
parent 3c6e4ddf6b
commit 999055fead
33 changed files with 308 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
CreateModel.bat Normal file
View File

@ -0,0 +1,33 @@
@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

BIN
DataBase/hjglDB_7_2024.03.18.rar
View File

Binary file not shown.

BIN
DataBase/hjglDB_7_2024.03.19.bak
View File

Binary file not shown.

BIN
DataBase/hjglDB_7_2024.03.28(本机).bak
View File

Binary file not shown.

BIN
DataBase/hjglDB_7_2024.05.14.bak Normal file
View File

Binary file not shown.

BIN
DataBase/hjglDB_7_2024.05.14.rar Normal file
View File

Binary file not shown.

0
DataBase/版本日志/HJGLDB_2024.01.30.sql → DataBase/版本日志/已完成/HJGLDB_2024.01.30.sql
View File

0
DataBase/版本日志/HJGLDB_2024.02.04.sql → DataBase/版本日志/已完成/HJGLDB_2024.02.04.sql
View File

0
DataBase/版本日志/HJGLDB_2024.03.07.sql → DataBase/版本日志/已完成/HJGLDB_2024.03.07.sql
View File

0
DataBase/版本日志/HJGLDB_2024.03.19.sql → DataBase/版本日志/已完成/HJGLDB_2024.03.19.sql
View File

0
DataBase/版本日志/HJGLDB_2024.04.08.sql → DataBase/版本日志/已完成/HJGLDB_2024.04.08.sql
View File

0
DataBase/版本日志/HJGLDB_2024.04.12.sql → DataBase/版本日志/已完成/HJGLDB_2024.04.12.sql
View File

0
DataBase/版本日志/HJGLDB_2024.04.13.sql → DataBase/版本日志/已完成/HJGLDB_2024.04.13.sql
View File

0
DataBase/版本日志/HJGLDB_2024.04.17.sql → DataBase/版本日志/已完成/HJGLDB_2024.04.17.sql
View File

0
DataBase/版本日志/HJGLDB_2024.04.18.sql → DataBase/版本日志/已完成/HJGLDB_2024.04.18.sql
View File

0
DataBase/版本日志/HJGLDB_2024.05.02.sql → DataBase/版本日志/已完成/HJGLDB_2024.05.02.sql
View File

BIN
HJGL/.vs/HJGL/v17/.suo
View File

Binary file not shown.

7
HJGL/BLL/Common/ProjectSet/Welder_TeamGroupService.cs
View File

@ -108,7 +108,12 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static ListItem[] GetAllTeamGroupList(string projectId, string unitId) public static ListItem[] GetAllTeamGroupList(string projectId, string unitId)
{ {
var q = (from x in Funs.DB.Welder_TeamGroup where x.ProjectId==projectId && x.UnitId == unitId orderby x.TeamGroupName select x).ToList(); var q = (from x in Funs.DB.Welder_TeamGroup where x.ProjectId==projectId orderby x.TeamGroupName select x).ToList();
if (!string.IsNullOrEmpty(unitId))
{
q = q.Where(x => x.UnitId == unitId).ToList();
}
ListItem[] lis = new ListItem[q.Count()]; ListItem[] lis = new ListItem[q.Count()];
for (int i = 0; i < q.Count(); i++) for (int i = 0; i < q.Count(); i++)

1
HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs
View File

@ -98,6 +98,7 @@ namespace BLL
SystemNumber = weldJoint.SystemNumber, SystemNumber = weldJoint.SystemNumber,
Remark = weldJoint.Remark, Remark = weldJoint.Remark,
IsGoldJoint = weldJoint.IsGoldJoint, IsGoldJoint = weldJoint.IsGoldJoint,
IsPMI=weldJoint.IsPMI,
WPQId = weldJoint.WPQId, WPQId = weldJoint.WPQId,
DetectionType = weldJoint.DetectionType, DetectionType = weldJoint.DetectionType,
PageNum = weldJoint.PageNum, PageNum = weldJoint.PageNum,

BIN
HJGL/FineUIPro.Web/File/Excel/HJGL_DataIn/焊接数据导入模版.xlsx
View File

Binary file not shown.

23
HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx.cs
View File

@ -354,6 +354,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
newDataInTemp.Value35 = ds.Tables[0].Rows[i][34].ToString().Trim(); newDataInTemp.Value35 = ds.Tables[0].Rows[i][34].ToString().Trim();
newDataInTemp.Value36 = ds.Tables[0].Rows[i][35].ToString().Trim(); newDataInTemp.Value36 = ds.Tables[0].Rows[i][35].ToString().Trim();
newDataInTemp.Value37 = ds.Tables[0].Rows[i][36].ToString().Trim(); newDataInTemp.Value37 = ds.Tables[0].Rows[i][36].ToString().Trim();
newDataInTemp.Value38 = ds.Tables[0].Rows[i][37].ToString().Trim();
BLL.DataInTempService.AddDataInTemp(newDataInTemp); BLL.DataInTempService.AddDataInTemp(newDataInTemp);
} }
@ -1542,10 +1543,24 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
} }
} }
//if (!string.IsNullOrEmpty(tempData.Value22) && !string.IsNullOrEmpty(tempData.Value23)) if (!string.IsNullOrEmpty(tempData.Value38))
//{ {
// weldJoint.Specification = "Φ" + tempData.Value22 + "*" + tempData.Value23; if (tempData.Value38 == "是")
//} {
weldJoint.IsPMI = true;
}
else if (tempData.Value38 == "否")
{
weldJoint.IsPMI = false;
}
}
else
{
if (jot != null && jot.IsPMI != null)
{
weldJoint.IsPMI = jot.IsPMI;
}
}
if (string.IsNullOrEmpty(errInfo)) // 所有信息正确的话 这插入管线焊口 if (string.IsNullOrEmpty(errInfo)) // 所有信息正确的话 这插入管线焊口
{ {

2
HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx
View File

@ -155,6 +155,8 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtValue38" Label="是否PMI检测" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue35" Label="WPS编号" runat="server" LabelWidth="120px"> <f:TextBox ID="txtValue35" Label="WPS编号" runat="server" LabelWidth="120px">
</f:TextBox> </f:TextBox>
</Items> </Items>

31
HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx.cs
View File

@ -74,7 +74,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
this.txtValue35.Text = dataInTemp.Value35; this.txtValue35.Text = dataInTemp.Value35;
this.txtValue36.Text = dataInTemp.Value36; this.txtValue36.Text = dataInTemp.Value36;
this.txtValue37.Text = dataInTemp.Value37; this.txtValue37.Text = dataInTemp.Value37;
//this.txtValue38.Text = dataInTemp.Value38; this.txtValue38.Text = dataInTemp.Value38;
this.lbErrCout.Text = dataInTemp.ToopValue; this.lbErrCout.Text = dataInTemp.ToopValue;
} }
} }
@ -541,19 +541,18 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
} }
} }
if (dataInTemp.Value38 != this.txtValue38.Text.Trim())
//if (dataInTemp.Value38 != this.txtValue38.Text.Trim()) {
//{ var tempValue38 = allDataInTemp.Where(x => x.Value38 == dataInTemp.Value38 || (x.Value38 == null && dataInTemp.Value38 == null));
// var tempValue38 = allDataInTemp.Where(x => x.Value38 == dataInTemp.Value38 || (x.Value38 == null && dataInTemp.Value38 == null)); if (tempValue38 != null)
// if (tempValue38 != null) {
// { foreach (var item in tempValue38)
// foreach (var item in tempValue38) {
// { item.Value38 = this.txtValue38.Text.Trim();
// item.Value38 = this.txtValue38.Text.Trim(); Funs.DB.SubmitChanges();
// Funs.DB.SubmitChanges(); }
// } }
// } }
//}
} }
else else
{ {
@ -597,8 +596,8 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
newDataInTemp.Value34 = this.txtValue34.Text.Trim(); newDataInTemp.Value34 = this.txtValue34.Text.Trim();
newDataInTemp.Value35 = this.txtValue35.Text.Trim(); newDataInTemp.Value35 = this.txtValue35.Text.Trim();
newDataInTemp.Value36 = this.txtValue36.Text.Trim(); newDataInTemp.Value36 = this.txtValue36.Text.Trim();
//newDataInTemp.Value37 = this.txtValue37.Text.Trim(); newDataInTemp.Value37 = this.txtValue37.Text.Trim();
//newDataInTemp.Value38 = this.txtValue38.Text.Trim(); newDataInTemp.Value38 = this.txtValue38.Text.Trim();
if (!string.IsNullOrEmpty(this.TempId)) if (!string.IsNullOrEmpty(this.TempId))
{ {

15
HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.DataIn { namespace FineUIPro.Web.WeldingProcess.DataIn
{
public partial class DataInEdit { public partial class DataInEdit
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -408,6 +410,15 @@ namespace FineUIPro.Web.WeldingProcess.DataIn {
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtValue37; protected global::FineUIPro.TextBox txtValue37;
/// <summary>
/// txtValue38 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue38;
/// <summary> /// <summary>
/// txtValue35 控件。 /// txtValue35 控件。
/// </summary> /// </summary>

2
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/GetWdldingDailyItem.ashx.cs
View File

@ -30,7 +30,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
viewWeldlines[i].WeldTypeCode, viewWeldlines[i].WeldTypeCode,
viewWeldlines[i].JointAttribute, viewWeldlines[i].JointAttribute,
viewWeldlines[i].WeldingLocationCode, viewWeldlines[i].WeldingLocationCode,
viewWeldlines[i].DoneDin, viewWeldlines[i].Size,
viewWeldlines[i].Dia, viewWeldlines[i].Dia,
viewWeldlines[i].Thickness, viewWeldlines[i].Thickness,
viewWeldlines[i].WeldingMethodCode, viewWeldlines[i].WeldingMethodCode,

4
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx
View File

@ -163,7 +163,7 @@
columnMenu: false, columnMenu: false,
columnResizing: false, columnResizing: false,
cls: 'gridinrowexpander', cls: 'gridinrowexpander',
fields: ['Num', 'PipelineCode', 'WeldJointCode', 'BackingWelderCode', 'CoverWelderCode', 'WeldTypeCode', 'JointAttribute', 'WeldingLocationCode', 'DoneDin', 'Dia', 'Thickness', 'WeldingMethodCode', 'Material1Code', 'Material2Code', 'ComponentsCode1', 'ComponentsCode2', 'HeartNo1', 'HeartNo2', 'WeldSilkCode', 'WeldMatCode', 'PipeSegment', 'WPQCode'], fields: ['Num', 'PipelineCode', 'WeldJointCode', 'BackingWelderCode', 'CoverWelderCode', 'WeldTypeCode', 'JointAttribute', 'WeldingLocationCode', 'Size', 'Dia', 'Thickness', 'WeldingMethodCode', 'Material1Code', 'Material2Code', 'ComponentsCode1', 'ComponentsCode2', 'HeartNo1', 'HeartNo2', 'WeldSilkCode', 'WeldMatCode', 'PipeSegment', 'WPQCode'],
columns: [{ columns: [{
text: '序号', field: 'Num', width: 50 text: '序号', field: 'Num', width: 50
}, { }, {
@ -181,7 +181,7 @@
}, { }, {
text: '焊接位置', field: 'WeldingLocationCode', width: 80 text: '焊接位置', field: 'WeldingLocationCode', width: 80
}, { }, {
text: '管径', field: 'DoneDin', width: 65 text: '管径', field: 'Size', width: 65
}, { }, {
text: '外径', field: 'Dia', width: 65 text: '外径', field: 'Dia', width: 65
}, { }, {

75
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs
View File

@ -1018,16 +1018,16 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
errorInfos += (i + 2) + "行,材质1[" + ds.Tables[0].Rows[i]["材质1"].ToString() + "]不存在；"; errorInfos += (i + 2) + "行,材质1[" + ds.Tables[0].Rows[i]["材质1"].ToString() + "]不存在；";
} }
else else
{
if ((!string.IsNullOrEmpty(d.Material1Id) && steel.MaterialId != d.Material1Id)
|| (!string.IsNullOrEmpty(d.Material2Id) && steel.MaterialId != d.Material2Id))
{
errorInfos += (i + 2) + "行,材质1[" + ds.Tables[0].Rows[i]["材质1"].ToString() + "]验证不一至；";
}
else
{ {
d.Material1Id = steel.MaterialId; d.Material1Id = steel.MaterialId;
//if (!string.IsNullOrEmpty(d.Material1Id) && d.Material1Id != steel.MaterialId) }
//{
// errorInfos += (i + 2) + "行,材质1[" + ds.Tables[0].Rows[i]["材质1"].ToString() + "]验证不一至；";
//}
//else
//{
// d.Material1Id = steel.MaterialId;
//}
} }
} }
@ -1039,18 +1039,19 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
errorInfos += (i + 2) + "行,材质2[" + ds.Tables[0].Rows[i]["材质2"].ToString() + "]不存在；"; errorInfos += (i + 2) + "行,材质2[" + ds.Tables[0].Rows[i]["材质2"].ToString() + "]不存在；";
} }
else else
{
if ((!string.IsNullOrEmpty(d.Material2Id) && steel.MaterialId!=d.Material2Id)
|| (!string.IsNullOrEmpty(d.Material1Id) && steel.MaterialId != d.Material1Id))
{
errorInfos += (i + 2) + "行,材质2[" + ds.Tables[0].Rows[i]["材质2"].ToString() + "]验证不一至；";
}
else
{ {
d.Material2Id = steel.MaterialId; d.Material2Id = steel.MaterialId;
//if (!string.IsNullOrEmpty(d.Material2Id) && d.Material2Id != steel.MaterialId)
//{
// errorInfos += (i + 2) + "行,材质2[" + ds.Tables[0].Rows[i]["材质2"].ToString() + "]验证不一至；";
//}
//else
//{
// d.Material2Id = steel.MaterialId;
//}
} }
} }
}
if (ds.Tables[0].Rows[i]["组件1"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["组件1"].ToString())) if (ds.Tables[0].Rows[i]["组件1"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["组件1"].ToString()))
{ {
@ -1061,7 +1062,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
} }
else else
{ {
if (!string.IsNullOrEmpty(d.PipeAssembly1Id) && d.PipeAssembly1Id != com.ComponentsId) if ((!string.IsNullOrEmpty(d.PipeAssembly1Id) && com.ComponentsId != d.PipeAssembly1Id)
|| (!string.IsNullOrEmpty(d.PipeAssembly2Id) && com.ComponentsId != d.PipeAssembly2Id))
{ {
errorInfos += (i + 2) + "行,组件1[" + ds.Tables[0].Rows[i]["组件1"].ToString() + "]验证不一至；"; errorInfos += (i + 2) + "行,组件1[" + ds.Tables[0].Rows[i]["组件1"].ToString() + "]验证不一至；";
} }
@ -1081,7 +1084,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
} }
else else
{ {
if (!string.IsNullOrEmpty(d.PipeAssembly2Id) && d.PipeAssembly2Id != com.ComponentsId) if ((!string.IsNullOrEmpty(d.PipeAssembly1Id) && com.ComponentsId != d.PipeAssembly1Id)
|| (!string.IsNullOrEmpty(d.PipeAssembly2Id) && com.ComponentsId != d.PipeAssembly2Id))
{ {
errorInfos += (i + 2) + "行,组件2[" + ds.Tables[0].Rows[i]["组件2"].ToString() + "]验证不一至；"; errorInfos += (i + 2) + "行,组件2[" + ds.Tables[0].Rows[i]["组件2"].ToString() + "]验证不一至；";
} }
@ -1094,27 +1098,28 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
if (ds.Tables[0].Rows[i]["炉批号1"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["炉批号1"].ToString())) if (ds.Tables[0].Rows[i]["炉批号1"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["炉批号1"].ToString()))
{ {
d.HeartNo1 = ds.Tables[0].Rows[i]["炉批号1"].ToString(); if ((!string.IsNullOrEmpty(d.HeartNo1) && ds.Tables[0].Rows[i]["炉批号1"].ToString() != d.HeartNo1)
//if (!string.IsNullOrEmpty(d.HeartNo1) && d.HeartNo1 != ds.Tables[0].Rows[i]["炉批号1"].ToString()) || (!string.IsNullOrEmpty(d.HeartNo2) && ds.Tables[0].Rows[i]["炉批号1"].ToString() != d.HeartNo2))
//{ {
// errorInfos += (i + 2) + "行,炉批号1[" + ds.Tables[0].Rows[i]["炉批号1"].ToString() + "]验证不一至；"; errorInfos += (i + 2) + "行,炉批号1[" + ds.Tables[0].Rows[i]["炉批号1"].ToString() + "]验证不一至；";
//}
//else
//{
// d.HeartNo1 = ds.Tables[0].Rows[i]["炉批号1"].ToString();
//}
} }
else
{
d.HeartNo1 = ds.Tables[0].Rows[i]["炉批号1"].ToString();
}
}
if (ds.Tables[0].Rows[i]["炉批号2"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["炉批号2"].ToString())) if (ds.Tables[0].Rows[i]["炉批号2"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["炉批号2"].ToString()))
{
if ((!string.IsNullOrEmpty(d.HeartNo1) && ds.Tables[0].Rows[i]["炉批号2"].ToString() != d.HeartNo1)
|| (!string.IsNullOrEmpty(d.HeartNo2) && ds.Tables[0].Rows[i]["炉批号2"].ToString() != d.HeartNo2))
{
errorInfos += (i + 2) + "行,炉批号2[" + ds.Tables[0].Rows[i]["炉批号2"].ToString() + "]验证不一至；";
}
else
{ {
d.HeartNo2 = ds.Tables[0].Rows[i]["炉批号2"].ToString(); d.HeartNo2 = ds.Tables[0].Rows[i]["炉批号2"].ToString();
//if (!string.IsNullOrEmpty(d.HeartNo2) && d.HeartNo2 != ds.Tables[0].Rows[i]["炉批号2"].ToString()) }
//{
// errorInfos += (i + 2) + "行,炉批号2[" + ds.Tables[0].Rows[i]["炉批号2"].ToString() + "]验证不一至；";
//}
//else
//{
// d.HeartNo2 = ds.Tables[0].Rows[i]["炉批号2"].ToString();
//}
} }
//if (ds.Tables[0].Rows[i]["焊丝"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["焊丝"].ToString())) //if (ds.Tables[0].Rows[i]["焊丝"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["焊丝"].ToString()))

11
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx
View File

@ -28,17 +28,20 @@
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items> <Items>
<f:DropDownList ID="drpInstallation" runat="server" Label="<%$ Resources:Lan,InstallationCode %>" AutoPostBack="true" <f:DropDownList ID="drpInstallation" runat="server" Label="<%$ Resources:Lan,InstallationCode %>" AutoPostBack="true"
LabelAlign="Right" Width="240px" OnSelectedIndexChanged="drpInstallation_OnSelectedIndexChanged"> LabelAlign="Right" Width="180px" LabelWidth="80px" OnSelectedIndexChanged="drpInstallation_OnSelectedIndexChanged">
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="drpWorkAreaId" runat="server" Label="<%$ Resources:Lan,Area %>" <f:DropDownList ID="drpWorkAreaId" runat="server" Label="<%$ Resources:Lan,Area %>"
LabelAlign="Right" Width="240px" > LabelAlign="Right" Width="180px" LabelWidth="80px" >
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="drpUnit" runat="server" Label="施工单位" LabelAlign="Right" Width="240px" EmptyText="请选择施工单位" <f:DropDownList ID="drpUnit" runat="server" Label="施工单位" LabelAlign="Right" Width="220px" EmptyText="请选择施工单位"
LabelWidth="90px"> LabelWidth="90px">
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="drpTeamGroup" runat="server" Label="班组" EnableCheckBoxSelect="true" EnableMultiSelect="true"
LabelAlign="Right" Width="240px" LabelWidth="80px">
</f:DropDownList>
<f:DatePicker runat="server" Label="焊接日期" ID="txtStarTime" LabelAlign="Right" <f:DatePicker runat="server" Label="焊接日期" ID="txtStarTime" LabelAlign="Right"
LabelWidth="100px" Width="220px"> LabelWidth="90px" Width="210px">
</f:DatePicker> </f:DatePicker>
<f:Label ID="Label1" runat="server" Text="<%$ Resources:Lan,To %>"> <f:Label ID="Label1" runat="server" Text="<%$ Resources:Lan,To %>">
</f:Label> </f:Label>

29
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs
View File

@ -1,7 +1,6 @@
using BLL; using BLL;
using NPOI.XSSF.UserModel; using NPOI.XSSF.UserModel;
using NPOI.SS.UserModel; using NPOI.SS.UserModel;
using NPOI.HSSF.Util;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -10,13 +9,9 @@ using System.Data.SqlClient;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using NPOI.HSSF.UserModel;
using NPOI.SS.Util;
using NPOI.SS.Formula.Functions;
using NPOI.OpenXmlFormats.Wordprocessing;
using System.Web.UI.WebControls;
using BorderStyle = NPOI.SS.UserModel.BorderStyle; using BorderStyle = NPOI.SS.UserModel.BorderStyle;
using System.Data.Linq;
namespace FineUIPro.Web.WeldingProcess.WeldingReport namespace FineUIPro.Web.WeldingProcess.WeldingReport
{ {
@ -36,6 +31,12 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
BLL.Project_InstallationService.InitInstallationDropDownList(drpInstallation, true, CurrUser.LoginProjectId, Resources.Lan.PleaseSelect); BLL.Project_InstallationService.InitInstallationDropDownList(drpInstallation, true, CurrUser.LoginProjectId, Resources.Lan.PleaseSelect);
BLL.Base_UnitService.InitProjectUnitDropDownList(this.drpUnit, true, CurrUser.LoginProjectId, Const.UnitType_5, Resources.Lan.PleaseSelect); BLL.Base_UnitService.InitProjectUnitDropDownList(this.drpUnit, true, CurrUser.LoginProjectId, Const.UnitType_5, Resources.Lan.PleaseSelect);
Funs.FineUIPleaseSelect(drpWorkAreaId, Resources.Lan.PleaseSelect); Funs.FineUIPleaseSelect(drpWorkAreaId, Resources.Lan.PleaseSelect);
var teamGroup = BLL.Welder_TeamGroupService.GetAllTeamGroupList(CurrUser.LoginProjectId, "");
drpTeamGroup.DataValueField = "Value";
drpTeamGroup.DataTextField = "Text";
drpTeamGroup.DataSource = teamGroup;
drpTeamGroup.DataBind();
Funs.FineUIPleaseSelect(drpTeamGroup, "");
} }
} }
@ -70,6 +71,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
left join Welder_Welder AS fw on weldJoint.BackingWelderId = fw.WelderId left join Welder_Welder AS fw on weldJoint.BackingWelderId = fw.WelderId
left join Welder_Welder AS cw on weldJoint.CoverWelderId = cw.WelderId left join Welder_Welder AS cw on weldJoint.CoverWelderId = cw.WelderId
LEFT JOIN dbo.Base_DetectionRate rate ON rate.DetectionRateId = pipeline.DetectionRateId LEFT JOIN dbo.Base_DetectionRate rate ON rate.DetectionRateId = pipeline.DetectionRateId
LEFT JOIN dbo.Welder_ProjectWelder pcw ON pcw.WelderId = weldJoint.CoverWelderId AND pcw.ProjectId=weldJoint.ProjectId
LEFT JOIN dbo.Welder_ProjectWelder pfw ON pfw.WelderId = weldJoint.BackingWelderId AND pfw.ProjectId=weldJoint.ProjectId
WHERE weldJoint.WeldingDailyId IS NOT NULL AND weldJoint.ProjectId=@projectId"; WHERE weldJoint.WeldingDailyId IS NOT NULL AND weldJoint.ProjectId=@projectId";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
@ -97,11 +100,13 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
strSql += " AND pipeline.UnitId = @UnitId"; strSql += " AND pipeline.UnitId = @UnitId";
listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue)); listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue));
} }
//if (this.drpWelder.SelectedValue!=Const._Null) if (this.drpTeamGroup.SelectedValueArray.Length>0)
//{ {
// strSql += " AND (weldJoint.CoverWelderId=@WelderId OR weldJoint.BackingWelderId=@WelderId)"; string[] teamGroupList = drpTeamGroup.SelectedValueArray;
// listStr.Add(new SqlParameter("@WelderId", drpWelder.SelectedValue)); string teamGroups = string.Join(",", teamGroupList);
//} strSql += " AND (CHARINDEX(pcw.TeamGroupId,@TeamGroupId)>0 OR CHARINDEX(pfw.TeamGroupId,@TeamGroupId)>0) ";
listStr.Add(new SqlParameter("@TeamGroupId", teamGroups));
}
if (txtStarTime.Text != "") if (txtStarTime.Text != "")
{ {
strSql += " AND weldingDaily.WeldingDate> = @WeldingStartDate"; strSql += " AND weldingDaily.WeldingDate> = @WeldingStartDate";

15
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.WeldingReport { namespace FineUIPro.Web.WeldingProcess.WeldingReport
{
public partial class WeldDailyExport { public partial class WeldDailyExport
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -84,6 +86,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport {
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpUnit; protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpTeamGroup 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpTeamGroup;
/// <summary> /// <summary>
/// txtStarTime 控件。 /// txtStarTime 控件。
/// </summary> /// </summary>

76
HJGL/Model/Model.cs
View File

@ -21479,10 +21479,12 @@ namespace Model
private int _Status; private int _Status;
private System.Nullable<System.DateTime> _CreatedTime; private System.Nullable<System.DateTime> _CheckTime;
private string _ReportNo; private string _ReportNo;
private System.Nullable<System.DateTime> _ReportTime;
#region 可扩展性方法定义 #region 可扩展性方法定义
partial void OnLoaded(); partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action); partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -21499,10 +21501,12 @@ namespace Model
partial void OnAcceptanceChanged(); partial void OnAcceptanceChanged();
partial void OnStatusChanging(int value); partial void OnStatusChanging(int value);
partial void OnStatusChanged(); partial void OnStatusChanged();
partial void OnCreatedTimeChanging(System.Nullable<System.DateTime> value); partial void OnCheckTimeChanging(System.Nullable<System.DateTime> value);
partial void OnCreatedTimeChanged(); partial void OnCheckTimeChanged();
partial void OnReportNoChanging(string value); partial void OnReportNoChanging(string value);
partial void OnReportNoChanged(); partial void OnReportNoChanged();
partial void OnReportTimeChanging(System.Nullable<System.DateTime> value);
partial void OnReportTimeChanged();
#endregion #endregion
public PMI_DelegationDetails() public PMI_DelegationDetails()
@ -21630,22 +21634,22 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")] [global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")]
public System.Nullable<System.DateTime> CreatedTime public System.Nullable<System.DateTime> CheckTime
{ {
get get
{ {
return this._CreatedTime; return this._CheckTime;
} }
set set
{ {
if ((this._CreatedTime != value)) if ((this._CheckTime != value))
{ {
this.OnCreatedTimeChanging(value); this.OnCheckTimeChanging(value);
this.SendPropertyChanging(); this.SendPropertyChanging();
this._CreatedTime = value; this._CheckTime = value;
this.SendPropertyChanged("CreatedTime"); this.SendPropertyChanged("CheckTime");
this.OnCreatedTimeChanged(); this.OnCheckTimeChanged();
} }
} }
} }
@ -21670,6 +21674,26 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")]
public System.Nullable<System.DateTime> ReportTime
{
get
{
return this._ReportTime;
}
set
{
if ((this._ReportTime != value))
{
this.OnReportTimeChanging(value);
this.SendPropertyChanging();
this._ReportTime = value;
this.SendPropertyChanged("ReportTime");
this.OnReportTimeChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
@ -40691,7 +40715,9 @@ namespace Model
private string _Acceptance; private string _Acceptance;
private System.Nullable<System.DateTime> _CreatedTime; private System.Nullable<System.DateTime> _CheckTime;
private System.Nullable<System.DateTime> _ReportTime;
private string _WeldJointId; private string _WeldJointId;
@ -40755,18 +40781,34 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")] [global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")]
public System.Nullable<System.DateTime> CreatedTime public System.Nullable<System.DateTime> CheckTime
{ {
get get
{ {
return this._CreatedTime; return this._CheckTime;
} }
set set
{ {
if ((this._CreatedTime != value)) if ((this._CheckTime != value))
{ {
this._CreatedTime = value; this._CheckTime = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")]
public System.Nullable<System.DateTime> ReportTime
{
get
{
return this._ReportTime;
}
set
{
if ((this._ReportTime != value))
{
this._ReportTime = value;
} }
} }
} }

BIN
HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache
View File

Binary file not shown.

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

@ -267,8 +267,12 @@ GO
alter table PMI_DelegationDetails add reportTime datetime
-- 增加报告编号
ALTER TABLE dbo.PMI_DelegationDetails ADD reportNo NVARCHAR(50)
-- 增加报告日期
ALTER TABLE dbo.PMI_DelegationDetails ADD reportTime datetime
GO
ALTER VIEW [dbo].[View_PMI_DelegationDetails] ALTER VIEW [dbo].[View_PMI_DelegationDetails]
@ -286,6 +290,7 @@ TrustItem.PMIId,
Trust.ProjectId, Trust.ProjectId,
Trust.DelegationNo, Trust.DelegationNo,
Trust.DelegationDate, Trust.DelegationDate,
ISNULL(TrustItem.reportNo,Trust.DelegationNo) as reportNo,
WeldJoint.WeldJointCode, WeldJoint.WeldJointCode,
Pipeline.PipelineCode, Pipeline.PipelineCode,
WeldJoint.Specification, WeldJoint.Specification,
@ -304,3 +309,4 @@ GO