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

提交代码

This commit is contained in:
高飞 2023-12-04 12:11:39 +08:00
parent ea22fad037
commit 1ce0a6da17
14 changed files with 334 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SGGL/BLL/HJGL/WeldingManage/WeldTaskService.cs
View File

@ -65,19 +65,23 @@ namespace BLL
return code; return code;
} }
public static List<Model.View_HJGL_WeldingTask> GetWeldingTaskList(string ProjectId, string UnitWorkId, DateTime taskDate,string canWelder) public static List<Model.View_HJGL_WeldingTask> GetWeldingTaskList(string ProjectId, string UnitWorkId, string unitId, DateTime taskDate, string canWelder)
{ {
var q = from x in Funs.DB.View_HJGL_WeldingTask var q = from x in Funs.DB.View_HJGL_WeldingTask
where x.ProjectId == ProjectId && x.UnitWorkId == UnitWorkId where x.ProjectId == ProjectId && x.UnitWorkId == UnitWorkId
&& x.TaskDate.Value.Date == taskDate.Date && x.TaskDate.Value.Date == taskDate.Date
select x; select x;
if (!string.IsNullOrEmpty(unitId))
{
q = q.Where(x => x.UnitId == unitId);
}
if (canWelder == "0") if (canWelder == "0")
{ {
q = q.Where(x => x.CanWelderId == null); q = q.Where(x => x.CanWelderId == null);
} }
else if(canWelder == "1") else if (canWelder == "1")
{ {
q=q.Where(x => x.CanWelderId != null); q = q.Where(x => x.CanWelderId != null);
} }
return q.ToList(); return q.ToList();
} }

26
SGGL/FineUIPro.Web/AttachFile/LookPic.aspx Normal file
View File

@ -0,0 +1,26 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LookPic.aspx.cs" Inherits="FineUIPro.Web.AttachFile.LookPic" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title></title>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="TabStrip1" runat="server" />
<f:TabStrip ID="TabStrip1" IsFluid="true" ShowBorder="true" ActiveTabIndex="0"
runat="server">
<Tabs>
<f:Tab ID="Tab1" EnableIFrame="true"
Title="预览" runat="server">
</f:Tab>
</Tabs>
</f:TabStrip>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" hidden="true" Text="关闭" runat="server" Icon="SystemClose" Size="Medium">
</f:Button>
<iframe id="LookHtml" runat="server" width="700" height="600" name="LookHtml" hidden="hidden"></iframe>
</form>
</body>
</html>

45
SGGL/FineUIPro.Web/AttachFile/LookPic.aspx.cs Normal file
View File

@ -0,0 +1,45 @@
using BLL;
using System;
using System.IO;
namespace FineUIPro.Web.AttachFile
{
public partial class LookPic : PageBase
{
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
var url = Request.Params["fileUrl"];
//var Baseurl = "https://view.officeapps.live.com/op/embed.aspx?src=";
// var Baseurl = "https://view.xdocin.com/view?src=";
var Fileurl = Funs.SGGLUrl + url.Replace(Funs.RootPath, "");
//var newurl = "";
//var FiletExtension = Path.GetExtension(url);
//if (FiletExtension == ".docx" || FiletExtension == ".doc" || FiletExtension == ".xls" || FiletExtension == ".xlsx")
//{
// newurl = Baseurl + Fileurl;
//}
//else if (FiletExtension == ".txt" || FiletExtension == "pdf")
//{
// newurl = Fileurl;
//}
//else
//{
// newurl = Fileurl;
//}
this.LookHtml.Src = Fileurl;
this.Tab1.IFrameUrl = Fileurl;
//StreamReader fread = new StreamReader(url, System.Text.Encoding.GetEncoding("gb2312"));
//string ss = fread.ReadToEnd();
//Response.Write(ss);
//fread.Close();
//fread.Dispose();
}
}
}
}

69
SGGL/FineUIPro.Web/AttachFile/LookPic.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,69 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.AttachFile {
public partial class LookPic {
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// TabStrip1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TabStrip TabStrip1;
/// <summary>
/// Tab1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tab Tab1;
/// <summary>
/// btnClose 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// LookHtml 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlIframe LookHtml;
}
}

10
SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs
View File

@ -376,8 +376,14 @@ namespace FineUIPro.Web.AttachFile
} }
else else
{ {
ShowNotify("不支持预览", MessageBoxIcon.Warning); if (FiletExtension == ".gif" || FiletExtension == ".jpg" || FiletExtension == ".jpeg" || FiletExtension == ".bmp" || FiletExtension == ".png")
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../AttachFile/LookPic.aspx?fileUrl={0}", url, "查看 -")));
}
else
{
ShowNotify("不支持预览", MessageBoxIcon.Warning);
}
} }
//if (FiletExtension == ".docx" || FiletExtension == ".pdf") //if (FiletExtension == ".docx" || FiletExtension == ".pdf")
//{ //{

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

@ -229,6 +229,7 @@
<Content Include="AttachFile\lib\popcorn.player.js" /> <Content Include="AttachFile\lib\popcorn.player.js" />
<Content Include="AttachFile\lib\popcorn.subtitle.js" /> <Content Include="AttachFile\lib\popcorn.subtitle.js" />
<Content Include="AttachFile\Look.aspx" /> <Content Include="AttachFile\Look.aspx" />
<Content Include="AttachFile\LookPic.aspx" />
<Content Include="AttachFile\officecontrol\edit_save_office.gif" /> <Content Include="AttachFile\officecontrol\edit_save_office.gif" />
<Content Include="AttachFile\officecontrol\index.js" /> <Content Include="AttachFile\officecontrol\index.js" />
<Content Include="AttachFile\officecontrol\ntko.js" /> <Content Include="AttachFile\officecontrol\ntko.js" />
@ -5848,6 +5849,13 @@
<Compile Include="AttachFile\Look.aspx.designer.cs"> <Compile Include="AttachFile\Look.aspx.designer.cs">
<DependentUpon>Look.aspx</DependentUpon> <DependentUpon>Look.aspx</DependentUpon>
</Compile> </Compile>
<Compile Include="AttachFile\LookPic.aspx.cs">
<DependentUpon>LookPic.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="AttachFile\LookPic.aspx.designer.cs">
<DependentUpon>LookPic.aspx</DependentUpon>
</Compile>
<Compile Include="AttachFile\OnlineEditing.aspx.cs"> <Compile Include="AttachFile\OnlineEditing.aspx.cs">
<DependentUpon>OnlineEditing.aspx</DependentUpon> <DependentUpon>OnlineEditing.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType> <SubType>ASPXCodeBehind</SubType>

2
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
View File

@ -612,7 +612,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID)) if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
{ {
var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == tvControlItem.SelectedNodeID && x.WPQId == null && x.IsTwoJoint == true select x; var jotList = from x in Funs.DB.HJGL_WeldJoint where weldJointIdList.Contains(x.WeldJointId) && x.WPQId == null && x.IsTwoJoint == true select x;
if (jotList.Count() > 0) if (jotList.Count() > 0)
{ {
foreach (var jot in jotList) foreach (var jot in jotList)

41
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
View File

@ -123,16 +123,49 @@ namespace FineUIPro.Web.HJGL.WeldingManage
string strList = Request.Params["strList"]; string strList = Request.Params["strList"];
List<string> list = Funs.GetStrListByStr(strList, '|'); List<string> list = Funs.GetStrListByStr(strList, '|');
if (list.Count() == 2) if (list.Count() == 3)
{ {
this.UnitWorkId = list[0]; this.UnitWorkId = list[0];
TaskDate = list[1]; string unitId = list[1];
TaskDate = list[2];
InitDropList(); InitDropList();
Model.WBS_UnitWork UnitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(this.UnitWorkId); Model.WBS_UnitWork UnitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(this.UnitWorkId);
BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, UnitWork.UnitId, false);//单位 BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, UnitWork.UnitId, false);//单位
this.drpUnit.SelectedValue = unitId;
if (!string.IsNullOrEmpty(TaskDate))
{
txtTaskDate.Text = TaskDate;
txtTaskDate.Enabled = false;
var task = (from x in Funs.DB.HJGL_WeldTask
where x.UnitWorkId == UnitWorkId && x.UnitId == unitId
&& x.TaskDate.Value.Date.ToString() == Convert.ToDateTime(txtTaskDate.Text.Trim()).ToString("yyyy-MM-dd")
select x).FirstOrDefault();
if (task != null)
{
txtTaskCode.Text = task.TaskCode;
//drpUnit.SelectedValue = task.UnitId;
}
txtTaskCode.Enabled = false;
}
string projectId = string.Empty;
if (UnitWorkId != null)
{
projectId = UnitWork.ProjectId;
this.txtUnitWorkName.Text = UnitWork.UnitWorkName;
}
}
else
{
this.UnitWorkId = list[0];
TaskDate = list[1];
InitDropList();
Model.WBS_UnitWork UnitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(this.UnitWorkId);
BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, UnitWork.UnitId, false);//单位
if (!string.IsNullOrEmpty(TaskDate)) if (!string.IsNullOrEmpty(TaskDate))
{ {
txtTaskDate.Text = TaskDate; txtTaskDate.Text = TaskDate;
@ -144,7 +177,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (task != null) if (task != null)
{ {
txtTaskCode.Text = task.TaskCode; txtTaskCode.Text = task.TaskCode;
drpUnit.SelectedValue = task.UnitId; //drpUnit.SelectedValue = task.UnitId;
} }
txtTaskCode.Enabled = false; txtTaskCode.Enabled = false;
} }
@ -464,7 +497,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
else else
{ {
var task = from x in Funs.DB.HJGL_WeldTask var task = from x in Funs.DB.HJGL_WeldTask
where x.UnitWorkId == UnitWorkId where x.UnitWorkId == UnitWorkId && x.UnitId == this.drpUnit.SelectedValue
&& x.TaskDate.Value.Date.ToString() == Convert.ToDateTime(txtTaskDate.Text.Trim()).ToString("yyyy-MM-dd") && x.TaskDate.Value.Date.ToString() == Convert.ToDateTime(txtTaskDate.Text.Trim()).ToString("yyyy-MM-dd")
select x; select x;
if (task.Count() > 0) if (task.Count() > 0)

99
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
View File

@ -242,7 +242,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
TreeNode newNode = new TreeNode(); TreeNode newNode = new TreeNode();
newNode.CommandName = "Date"; newNode.CommandName = "Date";
newNode.Text = string.Format("{0:yyyy-MM-dd}", item.Date) + "(" + BLL.UnitService.getUnitNamesUnitIds(item.UnitId) + ")"; newNode.Text = string.Format("{0:yyyy-MM-dd}", item.Date) + "(" + BLL.UnitService.getUnitNamesUnitIds(item.UnitId) + ")";
newNode.NodeID = node.NodeID + "|" + string.Format("{0:yyyy-MM-dd}", item.Date); newNode.NodeID = node.NodeID + "|" + item.UnitId + "|" + string.Format("{0:yyyy-MM-dd}", item.Date);
newNode.EnableClickEvent = true; newNode.EnableClickEvent = true;
node.Nodes.Add(newNode); node.Nodes.Add(newNode);
} }
@ -262,7 +262,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
TreeNode newNode = new TreeNode(); TreeNode newNode = new TreeNode();
newNode.CommandName = "Date"; newNode.CommandName = "Date";
newNode.Text = string.Format("{0:yyyy-MM-dd}", item.Date) + "(" + BLL.UnitService.getUnitNamesUnitIds(item.UnitId) + ")"; newNode.Text = string.Format("{0:yyyy-MM-dd}", item.Date) + "(" + BLL.UnitService.getUnitNamesUnitIds(item.UnitId) + ")";
newNode.NodeID = node.NodeID + "|" + string.Format("{0:yyyy-MM-dd}", item.Date); newNode.NodeID = node.NodeID + "|" + item.UnitId + "|" + string.Format("{0:yyyy-MM-dd}", item.Date);
newNode.EnableClickEvent = true; newNode.EnableClickEvent = true;
node.Nodes.Add(newNode); node.Nodes.Add(newNode);
} }
@ -613,28 +613,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
BLL.WeldTaskService.UpdateCanWelderTask(weldTaskId, canWelderId.Substring(0, canWelderId.Length - 1), canWelderCode.Substring(0, canWelderCode.Length - 1)); BLL.WeldTaskService.UpdateCanWelderTask(weldTaskId, canWelderId.Substring(0, canWelderId.Length - 1), canWelderCode.Substring(0, canWelderCode.Length - 1));
} }
//GetCanWelderDropDownList(GetWeldingTaskList); //GetCanWelderDropDownList(GetWeldingTaskList);
} }
DateTime? taskTime = null; string unitWorkId = string.Empty, unitId2 = string.Empty;
if (tvControlItem.SelectedNodeID.Contains("|")) if (tvControlItem.SelectedNodeID.Contains("|"))
{ {
taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]); unitWorkId = tvControlItem.SelectedNodeID.Split('|')[0];
unitId2 = tvControlItem.SelectedNodeID.Split('|')[1];
} }
else else
{ {
taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID); unitWorkId = tvControlItem.SelectedNodeID;
} }
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null; List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
if (taskTime != null) GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, unitWorkId, unitId2, Convert.ToDateTime(hdTaskWeldJoint.Text), this.rbIsAudit.SelectedValue);
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(tvControlItem.SelectedNodeID.Split('|')[1]), this.rbIsAudit.SelectedValue);
}
else
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text), this.rbIsAudit.SelectedValue);
}
this.BindGrid(GetWeldingTaskList); this.BindGrid(GetWeldingTaskList);
Alert.ShowInTop("已生成可焊焊工！", MessageBoxIcon.Success); Alert.ShowInTop("已生成可焊焊工！", MessageBoxIcon.Success);
@ -935,19 +929,19 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNode.ParentNode.NodeID); var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNode.ParentNode.NodeID);
if (w != null) if (w != null)
{ {
string UnitWorkId = w.UnitWorkId; //string UnitWorkId = w.UnitWorkId;
string taskDate = string.Empty; //string taskDate = string.Empty;
if (tvControlItem.SelectedNodeID.Contains("|")) //if (tvControlItem.SelectedNodeID.Contains("|"))
{ //{
taskDate = tvControlItem.SelectedNodeID.Split('|')[1]; // taskDate = tvControlItem.SelectedNodeID.Split('|')[2];
} //}
else //else
{ //{
taskDate = tvControlItem.SelectedNodeID; // taskDate = tvControlItem.SelectedNodeID;
} //}
string strList = UnitWorkId + "|" + taskDate; //string strList = UnitWorkId + "|" + taskDate;
string window = String.Format("SelectTaskWeldJoint.aspx?strList={0}", strList, "编辑 - "); string window = String.Format("SelectTaskWeldJoint.aspx?strList={0}", tvControlItem.SelectedNodeID, "编辑 - ");
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdTaskWeldJoint.ClientID) + Window1.GetShowReference(window)); PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdTaskWeldJoint.ClientID) + Window1.GetShowReference(window));
//PageContext.RegisterStartupScript(Window1.GetShowReference(window)); //PageContext.RegisterStartupScript(Window1.GetShowReference(window));
} }
@ -989,17 +983,18 @@ namespace FineUIPro.Web.HJGL.WeldingManage
} }
} }
} }
var unit = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID); string unitWorkId = string.Empty, unitId = string.Empty;
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null; if (tvControlItem.SelectedNodeID.Contains("|"))
if (unit == null)
{ {
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()), this.rbIsAudit.SelectedValue); unitWorkId = tvControlItem.SelectedNodeID.Split('|')[0];
unitId = tvControlItem.SelectedNodeID.Split('|')[1];
} }
else else
{ {
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()), this.rbIsAudit.SelectedValue); unitWorkId = tvControlItem.SelectedNodeID;
} }
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, unitWorkId, unitId, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()), this.rbIsAudit.SelectedValue);
this.BindGrid(GetWeldingTaskList); this.BindGrid(GetWeldingTaskList);
} }
@ -1058,12 +1053,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
{ {
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.HJGL_WeldTaskMenuId); var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.HJGL_WeldTaskMenuId);
if (this.tvControlItem.SelectedNode.CommandName == "建筑工程" || this.tvControlItem.SelectedNode.CommandName == "安装工程") if (this.tvControlItem.SelectedNodeID.Length == 1)
{ {
this.btnMenuAdd.Hidden = true; this.btnMenuAdd.Hidden = true;
this.btnMotify.Hidden = true; this.btnMotify.Hidden = true;
} }
else if (this.tvControlItem.SelectedNode.CommandName == "单位工程") else if (!this.tvControlItem.SelectedNodeID.Contains("|"))
{ {
if (buttonList.Contains(BLL.Const.BtnAdd)) if (buttonList.Contains(BLL.Const.BtnAdd))
{ {
@ -1071,7 +1066,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
} }
this.btnMotify.Hidden = true; this.btnMotify.Hidden = true;
} }
else if (this.tvControlItem.SelectedNode.CommandName == "Date") else if (this.tvControlItem.SelectedNodeID.Contains("|"))
{ {
if (buttonList.Contains(BLL.Const.BtnModify) || buttonList.Contains(BLL.Const.BtnSave)) if (buttonList.Contains(BLL.Const.BtnModify) || buttonList.Contains(BLL.Const.BtnSave))
{ {
@ -1080,12 +1075,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
this.btnMenuAdd.Hidden = true; this.btnMenuAdd.Hidden = true;
} }
var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID); var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
if (w == null && this.tvControlItem.SelectedNode.CommandName != "建筑工程" && this.tvControlItem.SelectedNode.CommandName != "安装工程") if (w == null)
{ {
DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]); DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[2]);
if (taskTime != null) if (taskTime != null)
{ {
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue); List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], tvControlItem.SelectedNodeID.Split('|')[1], Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue);
this.BindGrid(GetWeldingTaskList); this.BindGrid(GetWeldingTaskList);
} }
@ -1127,22 +1122,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
DateTime? taskTime = null; DateTime? taskTime = null;
if (tvControlItem.SelectedNodeID.Contains("|")) if (tvControlItem.SelectedNodeID.Contains("|"))
{ {
taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]); taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[2]);
} }
else else
{ {
taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID); taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID);
} }
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null; string unitWorkId = string.Empty, unitId = string.Empty;
if (taskTime != null) if (tvControlItem.SelectedNodeID.Contains("|"))
{ {
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue); unitWorkId = tvControlItem.SelectedNodeID.Split('|')[0];
unitId = tvControlItem.SelectedNodeID.Split('|')[1];
} }
else else
{ {
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(txtTaskDate.Text), this.rbIsAudit.SelectedValue); unitWorkId = tvControlItem.SelectedNodeID;
} }
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, unitWorkId, unitId, Convert.ToDateTime(txtTaskDate.Text), this.rbIsAudit.SelectedValue);
this.BindGrid(GetWeldingTaskList); this.BindGrid(GetWeldingTaskList);
drpCanWelder.Items.Clear(); drpCanWelder.Items.Clear();
//GetCanWelderDropDownList(GetWeldingTaskList); //GetCanWelderDropDownList(GetWeldingTaskList);
@ -1202,20 +1199,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage
protected void btnSearch_Click(object sender, EventArgs e) protected void btnSearch_Click(object sender, EventArgs e)
{ {
//List<Model.View_HJGL_WeldingTask> GetWeldingTaskItem = this.CollectGridJointInfo(); //List<Model.View_HJGL_WeldingTask> GetWeldingTaskItem = this.CollectGridJointInfo();
DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]); DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[2]);
if (taskTime != null) if (taskTime != null)
{ {
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue); List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], tvControlItem.SelectedNodeID.Split('|')[1], Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue);
this.BindGrid(GetWeldingTaskList); this.BindGrid(GetWeldingTaskList);
} }
} }
protected void btnPrint_Click(object sender, EventArgs e) protected void btnPrint_Click(object sender, EventArgs e)
{ {
DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]); DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[2]);
if (taskTime != null) if (taskTime != null)
{ {
var pipelines = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue).Select(x => x.PipelineId).Distinct().ToList(); var pipelines = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], tvControlItem.SelectedNodeID.Split('|')[1], Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue).Select(x => x.PipelineId).Distinct().ToList();
if (pipelines.Any()) if (pipelines.Any())
{ {
@ -1262,10 +1259,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
protected void rbIsAudit_SelectedIndexChanged(object sender, EventArgs e) protected void rbIsAudit_SelectedIndexChanged(object sender, EventArgs e)
{ {
DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]); DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[2]);
if (taskTime != null) if (taskTime != null)
{ {
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue); List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], tvControlItem.SelectedNodeID.Split('|')[1], Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue);
this.BindGrid(GetWeldingTaskList); this.BindGrid(GetWeldingTaskList);
} }
} }

8
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx
View File

@ -124,6 +124,14 @@
DataField="PipelineCode" SortField="PipelineCode" FieldType="String" DataField="PipelineCode" SortField="PipelineCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="150px"> HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="总达因" ColumnID="TotalSize"
DataField="TotalSize" SortField="TotalSize" FieldType="Double" HeaderTextAlign="Center"
TextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="预制总达因" ColumnID="TotalYZSize"
DataField="TotalYZSize" SortField="TotalYZSize" FieldType="Double" HeaderTextAlign="Center"
TextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="预制组件" ColumnID="PipelineComponentCode" <f:RenderField HeaderText="预制组件" ColumnID="PipelineComponentCode"
DataField="PipelineComponentCode" SortField="PipelineComponentCode" FieldType="String" DataField="PipelineComponentCode" SortField="PipelineComponentCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="150px"> HeaderTextAlign="Center" TextAlign="Left" Width="150px">

3
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
View File

@ -132,6 +132,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
string strSql = @"select (line.PipelineId+'&'+ISNULL(com.PipelineComponentId,'') ) as ID string strSql = @"select (line.PipelineId+'&'+ISNULL(com.PipelineComponentId,'') ) as ID
,line.PipelineId ,line.PipelineId
,(select ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot WHERE jot.PipelineId=line.PipelineId) as TotalSize
,(case when line.PipeArea='1' then (select ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot WHERE jot.PipelineId=line.PipelineId and jot.JointAttribute='预制口')
else (select ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot WHERE jot.PipelineId=line.PipelineId) end) as TotalYZSize
,line.PipelineCode ,line.PipelineCode
,line.ProjectId ,line.ProjectId
,line.UnitWorkId ,line.UnitWorkId

30
SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx
View File

@ -106,6 +106,35 @@
</f:Panel> </f:Panel>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow>
<Items>
<f:Panel runat="server" ID="panel2" RegionPosition="Center" RegionSplit="true" EnableCollapse="true" ShowBorder="true"
Layout="Fit" ShowHeader="true" RegionSplitWidth="20px" BodyPadding="1px" Height="215px" Title="施工单位进度统计"
TitleToolTip="施工单位进度统计" AutoScroll="true">
<Items>
<f:Grid ID="Grid3" ShowBorder="true" ShowHeader="false" Title="施工单位进度统计"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="UnitName"
EnableColumnLines="true" DataIDField="UnitName"
PageSize="15">
<Columns>
<f:RenderField HeaderText="施工单位" ColumnID="UnitName" ExpandUnusedSpace="true"
DataField="UnitName" SortField="UnitName" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="300px">
</f:RenderField>
<f:RenderField HeaderText="当日完成达因数" ColumnID="TodayFinishSize"
DataField="TodayFinishSize" SortField="TodayFinishSize" FieldType="Double" HeaderTextAlign="Center"
TextAlign="Center" Width="250px">
</f:RenderField>
<f:RenderField HeaderText="累计已完成达因数" ColumnID="FinishSize"
DataField="FinishSize" SortField="FinishSize" FieldType="Double" HeaderTextAlign="Center"
TextAlign="Center" Width="250px">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" RegionSplit="true" EnableCollapse="true" ShowBorder="true" <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" RegionSplit="true" EnableCollapse="true" ShowBorder="true"
@ -186,6 +215,7 @@
</f:Panel> </f:Panel>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
</f:Form> </f:Form>
</Items> </Items>

26
SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs
View File

@ -19,6 +19,7 @@ namespace FineUIPro.Web.common
this.InitTreeMenu();//加载树 this.InitTreeMenu();//加载树
this.txtWeldingDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.txtWeldingDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
BindGrid1(); BindGrid1();
BindGrid3();
} }
} }
@ -26,6 +27,7 @@ namespace FineUIPro.Web.common
{ {
BindGrid1(); BindGrid1();
BindGrid2(this.tvControlItem.SelectedNodeID); BindGrid2(this.tvControlItem.SelectedNodeID);
BindGrid3();
} }
#region 加载树装置-单位-工作区 #region 加载树装置-单位-工作区
@ -197,6 +199,30 @@ select '现场施工' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize
this.lbNotCompleteDin2.Text = notCompleteDin2.ToString(); this.lbNotCompleteDin2.Text = notCompleteDin2.ToString();
} }
} }
/// <summary>
/// 数据绑定
/// </summary>
private void BindGrid3()
{
string strSql = @"select distinct UnitName,
CAST((SELECT ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot left join dbo.HJGL_WeldingDaily d on d.WeldingDailyId=jot.WeldingDailyId WHERE d.ProjectId=@ProjectId and d.UnitId=b.UnitId and jot.WeldingDailyId IS NOT NULL and d.WeldingDate=@WeldingDate) AS DECIMAL(12,3)) AS TodayFinishSize,
CAST((SELECT ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot left join dbo.HJGL_WeldingDaily d on d.WeldingDailyId=jot.WeldingDailyId WHERE d.ProjectId=@ProjectId and d.UnitId=b.UnitId and jot.WeldingDailyId IS NOT NULL and d.WeldingDate<=@WeldingDate) AS DECIMAL(12,3)) AS FinishSize
from HJGL_WeldingDaily b
left join Base_Unit u on b.UnitId=u.UnitId
where b.ProjectId=@ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", (CurrUser != null) ? CurrUser.LoginProjectId : ""));
listStr.Add(new SqlParameter("@WeldingDate", this.txtWeldingDate.Text.Trim()));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid3.RecordCount = tb.Rows.Count;
tb = GetFilteredTable(Grid3.FilteredData, tb);
var table = GetPagedDataTable(Grid3, tb);
Grid3.DataSource = table;
Grid3.DataBind();
}
#endregion #endregion
/// <summary> /// <summary>

18
SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.designer.cs generated
View File

@ -192,6 +192,24 @@ namespace FineUIPro.Web.common {
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnQueryTotal; protected global::FineUIPro.Button btnQueryTotal;
/// <summary>
/// panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panel2;
/// <summary>
/// Grid3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid3;
/// <summary> /// <summary>
/// panelCenterRegion 控件。 /// panelCenterRegion 控件。
/// </summary> /// </summary>