lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

This commit is contained in:
高飞 2025-02-26 09:10:21 +08:00
parent 07ad76a6bf 1791e3b02f
commit b5402ac114
15 changed files with 598 additions and 473 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
SGGL/BLL/Transfer/PunchlistFromService.cs
View File

@ -1,14 +1,41 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
public class PunchlistFromService
{
/// <summary>
/// Turnover System Code下拉框
/// </summary>
/// <param name="projectId">项目id</param>
/// <param name="dropName">下拉框名字</param>
/// <param name="isShowPlease">是否显示请选择</param>
public static void InitTurnoverSystemCodeUnitDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
{
dropName.DataValueField = "string";
dropName.DataTextField = "string";
dropName.DataSource = GetTurnoverSystemCodeUnitDropDownList(projectId);
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
/// <summary>
/// 获取Turnover System Code下拉框
/// </summary>
/// <param name="projectId">项目id</param>
/// <returns></returns>
public static List<string> GetTurnoverSystemCodeUnitDropDownList(string projectId)
{
var list = (from x in Funs.DB.Transfer_PunchlistFrom
where x.ProjectId == projectId
select x.Sub_Sys_No).Distinct().OrderBy(x => x).ToList();
return list;
}
/// <summary>
/// 责任单位下拉框
@ -18,7 +45,6 @@ namespace BLL
/// <param name="isShowPlease">是否显示请选择</param>
public static void InitActionByUnitDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
{
var sss = GetActionByUnitDropDownList(projectId);
dropName.DataValueField = "string";
dropName.DataTextField = "string";
dropName.DataSource = GetActionByUnitDropDownList(projectId);

6
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
View File

@ -65,7 +65,8 @@
<f:Button ID="Button2" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnClose" Icon="SystemClose" runat="server" ToolTip="关闭" Text="关闭" OnClick="btnClose_Click">
</f:Button>
</td>
</tr>
</table>
@ -2084,6 +2085,9 @@
</f:Button>
<f:Button ID="Button5" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnLoad_Click" Hidden="true">
</f:Button>
<f:Button ID="Button6" Icon="SystemClose" runat="server" ToolTip="关闭" Text="关闭" OnClick="btnClose_Click">
</f:Button>
<f:HiddenField ID="hdId" runat="server">
</f:HiddenField>

32
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
View File

@ -322,14 +322,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
lodAllGrid("0");
}
Grid10.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
gvTj.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvSb.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvGD.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvDq.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvYb.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvFf.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvXf.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//Grid10.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//gvTj.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvSb.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvGD.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvDq.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvYb.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvFf.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvXf.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
hidReportId.Value = ReportId;
}
@ -1214,8 +1214,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 7.3 无损检测管理 Grid10方法
void loadProcessControl_NondestructiveTest_New()
{
DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
DateTime startDate = Convert.ToDateTime(string.Format(this.txtStartDate.Text.Trim()));
DateTime endDate = Convert.ToDateTime(string.Format("{0:yyyy-MM-dd HH:mm:ss}", this.txtEndDate.Text.Trim() + " 23:59:59"));
var list = new List<Model.ProcessControl_NondestructiveTest_New>();
//加载所有施工分包单位
//var units = from x in db.Project_ProjectUnit
@ -1239,8 +1239,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
from u in unitJoin.DefaultIfEmpty()
where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
&& c.CreateDate >= Convert.ToDateTime(startDate) && c.CreateDate <= Convert.ToDateTime(endDate)
&& c.CreateDate >= startDate && c.CreateDate <= endDate
orderby c.CreateDate descending
select new
@ -1380,6 +1379,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
hidWsjcgl.Hidden = false;
}
else {
Grid10.Hidden = false;
hidWsjcgl.Hidden = true;
Grid10.DataSource = list;
Grid10.DataBind();
@ -2866,7 +2867,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
SaveMethod();
ShowNotify("编辑成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
//PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
private void SaveMethod()
@ -4108,5 +4109,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
Session["_ViewState"] = viewState;
}
protected void btnClose_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
}
}

24
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.ManageReportNew {
namespace FineUIPro.Web.CQMS.ManageReportNew
{
public partial class MonthReportEdit {
public partial class MonthReportEdit
{
/// <summary>
/// form1 控件。
@ -75,6 +77,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew {
/// </remarks>
protected global::FineUIPro.Button Button2;
/// <summary>
/// btnClose 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// Table5 控件。
/// </summary>
@ -1857,6 +1868,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew {
/// </remarks>
protected global::FineUIPro.Button Button5;
/// <summary>
/// Button6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button Button6;
/// <summary>
/// hdId 控件。
/// </summary>

5
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
View File

@ -64,7 +64,8 @@
<f:Button ID="Button2" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnClose" Icon="SystemClose" runat="server" ToolTip="关闭" Text="关闭" OnClick="btnClose_Click">
</f:Button>
</td>
</tr>
</table>
@ -2090,6 +2091,8 @@
</f:Button>
<f:Button ID="Button5" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnLoad_Click" Hidden="true">
</f:Button>
<f:Button ID="Button6" Icon="SystemClose" runat="server" ToolTip="关闭" Text="关闭" OnClick="btnClose_Click">
</f:Button>
<f:HiddenField ID="hdId" runat="server">
</f:HiddenField>

32
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
View File

@ -262,14 +262,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
lodAllGrid("0");
}
Grid10.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
gvTj.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvSb.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvGD.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvDq.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvYb.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvFf.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvXf.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//Grid10.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//gvTj.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvSb.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvGD.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvDq.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvYb.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvFf.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvXf.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
hidReportId.Value = ReportId;
}
@ -1140,7 +1140,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
void loadProcessControl_NondestructiveTest_New()
{
DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
DateTime endDate = Convert.ToDateTime(string.Format("{0:yyyy-MM-dd HH:mm:ss}", this.txtEndDate.Text.Trim() + " 23:59:59"));
var list = new List<Model.ProcessControl_NondestructiveTest_New>();
//加载所有施工分包单位
//var units = from x in db.Project_ProjectUnit
@ -1164,8 +1164,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
from u in unitJoin.DefaultIfEmpty()
where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
&& c.CreateDate >= Convert.ToDateTime(startDate) && c.CreateDate <= Convert.ToDateTime(endDate)
&& c.CreateDate >= startDate && c.CreateDate <= endDate
orderby c.CreateDate descending
select new
@ -1307,6 +1306,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
else
{
Grid10.Hidden = false;
hidWsjcgl.Hidden = true;
Grid10.DataSource = list;
Grid10.DataBind();
@ -2795,8 +2796,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
return;
}
SaveMethod();
ShowNotify("编辑成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
ShowNotify("保存成功！", MessageBoxIcon.Success);
//PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#region 保存方法
@ -4051,5 +4052,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
Session["_ViewState"] = viewState;
}
protected void btnClose_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
}
}

24
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.ManageReportNew {
namespace FineUIPro.Web.CQMS.ManageReportNew
{
public partial class WeekReportEdit {
public partial class WeekReportEdit
{
/// <summary>
/// form1 控件。
@ -75,6 +77,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew {
/// </remarks>
protected global::FineUIPro.Button Button2;
/// <summary>
/// btnClose 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// Table5 控件。
/// </summary>
@ -1857,6 +1868,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew {
/// </remarks>
protected global::FineUIPro.Button Button5;
/// <summary>
/// Button6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button Button6;
/// <summary>
/// hdId 控件。
/// </summary>

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls
View File

Binary file not shown.

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/PunchlistFrom导入模板.xls
View File

Binary file not shown.

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/RotatingEquipment导入模板.xls
View File

Binary file not shown.

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -19406,7 +19406,7 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

2
SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
View File

@ -49,7 +49,7 @@
<f:Panel ID="Panel4" CssClass="blockpanel" runat="server" EnableCollapse="false"
BodyPadding="10px" ShowBorder="true" ShowHeader="false">
<Items>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="650px" ShowBorder="true"
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="800px" ShowBorder="true"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server" AutoPostBack="true" OnTabIndexChanged="TabStrip1_TabIndexChanged">
<Tabs>
<f:Tab ID="Tab1" Title="图形" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server" CssStyle="width:100%"

6
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
View File

@ -22,7 +22,9 @@
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" ID="txtSystem_No" Label="System No" LabelWidth="100px" LabelAlign="Right" Width="180px"></f:TextBox>
<f:TextBox runat="server" ID="txtSub_Sys_No" Label="Turnover System Code" LabelWidth="180px" LabelAlign="Right"></f:TextBox>
<%--<f:TextBox runat="server" ID="txtSub_Sys_No" Label="Turnover System Code" LabelWidth="180px" LabelAlign="Right"></f:TextBox>--%>
<f:DropDownList ID="drpTurnoverSystemCode" runat="server" Label="Turnover System Code" AutoPostBack="true" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" LabelWidth="180px">
</f:DropDownList>
<f:TextBox runat="server" ID="txtRaised_By" Label="Raised By" LabelWidth="90px" LabelAlign="Right" Width="150px"></f:TextBox>
<f:TextBox runat="server" ID="txtDisc" Label="Disc" LabelWidth="40px" LabelAlign="Right" Width="120px"></f:TextBox>
@ -87,7 +89,7 @@
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="ddlAction_By" runat="server" Label="责任单位" AutoPostBack="true" Width="220px" LabelWidth="80px">
<f:DropDownList ID="ddlAction_By" runat="server" Label="责任单位" AutoPostBack="true" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelWidth="80px">
</f:DropDownList>
<%--<f:TextBox runat="server" ID="txtAction_By" Label="责任单位" LabelWidth="80px" LabelAlign="Right" Width="180px"></f:TextBox>--%>
<f:TextBox runat="server" ID="txtPIC" Label="责任人PIC" LabelWidth="90px" LabelAlign="Right" Width="170px"></f:TextBox>

52
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
View File

@ -31,7 +31,8 @@ namespace FineUIPro.Web.Transfer
if (!IsPostBack)
{
GetButtonPower();
BLL.PunchlistFromService.InitActionByUnitDropDownList(this.ddlAction_By, this.CurrUser.LoginProjectId, true);
BLL.PunchlistFromService.InitTurnoverSystemCodeUnitDropDownList(this.drpTurnoverSystemCode, this.CurrUser.LoginProjectId, false);
BLL.PunchlistFromService.InitActionByUnitDropDownList(this.ddlAction_By, this.CurrUser.LoginProjectId, false);
BindGrid();
this.btnNew.OnClientClick = Window1.GetShowReference("PunchlistFromEdit.aspx") + "return false;";
@ -58,10 +59,25 @@ namespace FineUIPro.Web.Transfer
strSql += " AND System_No like @System_No";
listStr.Add(new SqlParameter("@System_No", "%" + this.txtSystem_No.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtSub_Sys_No.Text.Trim()))
//if (!string.IsNullOrEmpty(this.txtSub_Sys_No.Text.Trim()))
//{
// strSql += " AND Sub_Sys_No like @Sub_Sys_No";
// listStr.Add(new SqlParameter("@Sub_Sys_No", "%" + this.txtSub_Sys_No.Text.Trim() + "%"));
//}
if (this.drpTurnoverSystemCode.SelectedItemArray.Count() > 1 || (this.drpTurnoverSystemCode.SelectedValue != BLL.Const._Null && this.drpTurnoverSystemCode.SelectedItemArray.Count() == 1))
{
strSql += " AND Sub_Sys_No like @Sub_Sys_No";
listStr.Add(new SqlParameter("@Sub_Sys_No", "%" + this.txtSub_Sys_No.Text.Trim() + "%"));
strSql += " AND (1=2 ";
int i = 0;
foreach (var item in this.drpTurnoverSystemCode.SelectedValueArray)
{
if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
{
strSql += " OR Sub_Sys_No = @Sub_Sys_No" + i.ToString();
listStr.Add(new SqlParameter("@Sub_Sys_No" + i.ToString(), item));
}
i++;
}
strSql += ")";
}
//if (!string.IsNullOrEmpty(txtStartDate_Raised.Text.Trim()))
//{
@ -123,11 +139,33 @@ namespace FineUIPro.Web.Transfer
// strSql += " AND Action_By = @Action_By";
// listStr.Add(new SqlParameter("@Action_By", txtAction_By.Text.Trim()));
//}
if (ddlAction_By.SelectedValue != BLL.Const._Null)
//if (ddlAction_By.SelectedValue != null && ddlAction_By.SelectedValue != BLL.Const._Null)
//{
// strSql += " AND Action_By = @Action_By";
// listStr.Add(new SqlParameter("@Action_By", ddlAction_By.SelectedValue.Trim()));
//}
if (this.ddlAction_By.SelectedItemArray.Count() > 1 || (this.ddlAction_By.SelectedValue != BLL.Const._Null && this.ddlAction_By.SelectedItemArray.Count() == 1))
{
strSql += " AND Action_By = @Action_By";
listStr.Add(new SqlParameter("@Action_By", ddlAction_By.SelectedValue.Trim()));
strSql += " AND (1=2 ";
int i = 0;
foreach (var item in this.ddlAction_By.SelectedValueArray)
{
if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
{
strSql += " OR Action_By = @Action_By" + i.ToString();
listStr.Add(new SqlParameter("@Action_By" + i.ToString(), item));
}
i++;
}
strSql += ")";
}
//if (ddlAction_By.SelectedValue != null && ddlAction_By.SelectedValue != BLL.Const._Null)
//{
// strSql += " AND Action_By = @Action_By";
// listStr.Add(new SqlParameter("@Action_By", ddlAction_By.SelectedValue.Trim()));
//}
if (!string.IsNullOrEmpty(txtPIC.Text.Trim()))
{
strSql += " AND PIC = @PIC";

4
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs generated
View File

@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
protected global::FineUIPro.TextBox txtSystem_No;
/// <summary>
/// txtSub_Sys_No 控件。
/// drpTurnoverSystemCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSub_Sys_No;
protected global::FineUIPro.DropDownList drpTurnoverSystemCode;
/// <summary>
/// txtRaised_By 控件。