diff --git a/DataBase/版本日志/SGGLDB_V2022-10-19.sql b/DataBase/版本日志/SGGLDB_V2022-10-19.sql new file mode 100644 index 00000000..491dbae0 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2022-10-19.sql @@ -0,0 +1 @@ +alter table HJGL_YardPlanning add UnitWorkId varchar(50) \ No newline at end of file diff --git a/SGGL/BLL/API/HJGL/APIPackagingManageService.cs b/SGGL/BLL/API/HJGL/APIPackagingManageService.cs index 518af20f..c6f1c409 100644 --- a/SGGL/BLL/API/HJGL/APIPackagingManageService.cs +++ b/SGGL/BLL/API/HJGL/APIPackagingManageService.cs @@ -29,7 +29,7 @@ namespace BLL StackingPosition = x.StackingPosition, State= x.State, ReceiveMan=t.PersonName, - ReceiveDate=x.ReceiveDate, + ReceiveDate = string.Format("{0:g}", x.ReceiveDate) }).Distinct(); return q.ToList(); @@ -57,7 +57,7 @@ namespace BLL StackingPosition = x.StackingPosition, State =x.State, ReceiveMan = t.PersonName, - ReceiveDate = x.ReceiveDate, + ReceiveDate = string.Format("{0:g}", x.ReceiveDate) }).FirstOrDefault(); var tb_packing = (from x in db.HJGL_PackagingManage where x.PackagingManageId==packagingManageId select x ).FirstOrDefault() ; var PipelineComponentIdList = tb_packing.PipelineComponentId.Split(','); @@ -70,7 +70,7 @@ namespace BLL PipelineComponentCode = x.PipelineComponentCode, PreUnit = "1/个", UnitWorkName = z.UnitWorkName, - PlanStartDate=y.PlanStartDate + PlanStartDate = string.Format("{0:g}", y.PlanStartDate), }).ToList(); bool isPower = Person_PersonsService.IsGeneralUnitByPersonId(personId, projectId); diff --git a/SGGL/BLL/API/HJGL/APIPipelineComponentService.cs b/SGGL/BLL/API/HJGL/APIPipelineComponentService.cs index 34e3bda3..a771cae4 100644 --- a/SGGL/BLL/API/HJGL/APIPipelineComponentService.cs +++ b/SGGL/BLL/API/HJGL/APIPipelineComponentService.cs @@ -30,10 +30,10 @@ namespace BLL DrawingName = x.DrawingName, BoxNumber = x.BoxNumber, State = x.State, - PlanStartDate = y.PlanStartDate, + PlanStartDate = string.Format("{0:g}", y.PlanStartDate) , QRCode = x.QRCode, ReceiveMan=p.PersonName, - ReceiveDate=x.ReceiveDate + ReceiveDate= string.Format("{0:g}", x.ReceiveDate) }).Distinct(); return q.ToList(); @@ -60,10 +60,10 @@ namespace BLL DrawingName = x.DrawingName, BoxNumber = x.BoxNumber, State = x.State, - PlanStartDate = y.PlanStartDate, + PlanStartDate = string.Format("{0:g}", y.PlanStartDate), QRCode = x.QRCode, ReceiveMan = p.PersonName, - ReceiveDate = x.ReceiveDate + ReceiveDate = string.Format("{0:g}", x.ReceiveDate) }).FirstOrDefault(); bool isPower = Person_PersonsService.IsGeneralUnitByPersonId(personId, projectId); pipelineComponentDetail.pipelineComponentItem = q; diff --git a/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs b/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs index ec823db7..4cb51e43 100644 --- a/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs +++ b/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs @@ -136,7 +136,7 @@ namespace BLL FROM dbo.HJGL_PipeLineMat pipe LEFT JOIN dbo.HJGL_MaterialCodeLib lib ON lib.MaterialCode = pipe.MaterialCode LEFT JOIN HJGL_Pipeline line ON pipe.PipelineId=line.PipelineId - WHERE line.PipeArea=@PipeArea and line.State=1 + WHERE line.PipeArea=@PipeArea group by lib.MaterialCode,lib.MaterialName,lib.MaterialUnit, lib.MaterialSpec,lib.MaterialMade) as aa on mat.MaterialCode=aa.MaterialCode where mat.projectid=@Projectid and Ins.State=@State group by mat.MaterialCode,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num diff --git a/SGGL/BLL/HJGL/PreDesign/YardPlanningService.cs b/SGGL/BLL/HJGL/PreDesign/YardPlanningService.cs index 3f4ceb60..f435390c 100644 --- a/SGGL/BLL/HJGL/PreDesign/YardPlanningService.cs +++ b/SGGL/BLL/HJGL/PreDesign/YardPlanningService.cs @@ -14,10 +14,10 @@ namespace BLL { return Funs.DB.HJGL_YardPlanning.FirstOrDefault(e => e.YardPlanningId == YardPlanningId); } - public static Model.HJGL_YardPlanning GetHJGL_YardPlanningByProjectId(string projectId) + public static Model.HJGL_YardPlanning GetHJGL_YardPlanningByProjectId(string projectId,string unitworkid) { - return Funs.DB.HJGL_YardPlanning.FirstOrDefault(e => e.ProjectId == projectId); + return Funs.DB.HJGL_YardPlanning.FirstOrDefault(e => e.ProjectId == projectId && e.UnitWorkId == unitworkid); } /// /// 保存应急流程图 @@ -25,9 +25,9 @@ namespace BLL /// /// /// - public static void SavePic(string projectid, string imgurl) + public static void SavePic(string projectid,string unitworkid, string imgurl) { - var model = Funs.DB.HJGL_YardPlanning.FirstOrDefault(e => e.ProjectId == projectid); + var model = Funs.DB.HJGL_YardPlanning.FirstOrDefault(e => e.ProjectId == projectid && e.UnitWorkId==unitworkid); if (model != null) { model.FlowChartPic = imgurl; @@ -38,6 +38,7 @@ namespace BLL Model.HJGL_YardPlanning table = new Model.HJGL_YardPlanning(); table.YardPlanningId = SQLHelper.GetNewID(typeof(Model.HJGL_YardPlanning)); table.ProjectId = projectid; + table.UnitWorkId = unitworkid; table.FlowChartPic = imgurl; Funs.DB.HJGL_YardPlanning.InsertOnSubmit(table); Funs.DB.SubmitChanges(); @@ -51,6 +52,7 @@ namespace BLL table.ProjectId = newtable.ProjectId; table.Remark = newtable.Remark; table.FlowChartPic = newtable.FlowChartPic; + table.UnitWorkId = newtable.UnitWorkId; Funs.DB.HJGL_YardPlanning.InsertOnSubmit(table); Funs.DB.SubmitChanges(); } @@ -66,6 +68,7 @@ namespace BLL table.ProjectId = newtable.ProjectId; table.Remark = newtable.Remark; table.FlowChartPic = newtable.FlowChartPic; + table.UnitWorkId = newtable.UnitWorkId; Funs.DB.SubmitChanges(); } diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs index a4dc0252..bfd3ef12 100644 --- a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs @@ -237,6 +237,16 @@ namespace BLL select x).ToList(); return q; + } + public static List GetComponentByPipelineId(string PipelineId) + { + + Model.SGGLDB db = Funs.DB; + var q = (from x in db.HJGL_Pipeline_Component + where x.PipelineId == PipelineId + select x).OrderBy(x=>x.PlanStartDate).ToList(); + return q; + } /// /// 管线下拉框 diff --git a/SGGL/FineUIPro.Web/Controls/Fastreport.aspx b/SGGL/FineUIPro.Web/Controls/Fastreport.aspx index 29cb5a29..8e5b623d 100644 --- a/SGGL/FineUIPro.Web/Controls/Fastreport.aspx +++ b/SGGL/FineUIPro.Web/Controls/Fastreport.aspx @@ -10,9 +10,10 @@
+
- + diff --git a/SGGL/FineUIPro.Web/File/Excel/DataOut/WeldingPlanDataOut_SHOP.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/WeldingPlanDataOut_SHOP.xlsx index a5918fd5..8c6ded48 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataOut/WeldingPlanDataOut_SHOP.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataOut/WeldingPlanDataOut_SHOP.xlsx differ diff --git a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx index a0d631c5..108cab68 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -99,7 +99,7 @@ namespace FastReport } - + diff --git a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx index a21800e9..3185a683 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + @@ -61,9 +61,9 @@ namespace FastReport - + - + @@ -80,10 +80,10 @@ namespace FastReport - + - - + + @@ -95,11 +95,11 @@ namespace FastReport - - + + - - + + @@ -110,12 +110,12 @@ namespace FastReport - - - + + + - - + + @@ -129,6 +129,6 @@ namespace FastReport - + diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs index c2dc7d1e..b7adc101 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs @@ -12,6 +12,50 @@ namespace FineUIPro.Web.HJGL.InfoQuery { public partial class JointQuery : PageBase { + public decimal JointComplete + { + get + { + return (decimal)ViewState["JointComplete"]; + } + set + { + ViewState["JointComplete"] = value; + } + } + public decimal JointNoComplete + { + get + { + return (decimal)ViewState["JointNoComplete"]; + } + set + { + ViewState["JointNoComplete"] = value; + } + } + public int JointPre + { + get + { + return (int)ViewState["JointPre"]; + } + set + { + ViewState["JointPre"] = value; + } + } + public int JointNoPre + { + get + { + return (int)ViewState["JointNoPre"]; + } + set + { + ViewState["JointNoPre"] = value; + } + } protected void Page_Load(object sender, EventArgs e) { ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId); @@ -19,6 +63,10 @@ namespace FineUIPro.Web.HJGL.InfoQuery { this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.InitTreeMenu();//加载树 + this.JointComplete = 0; + this.JointNoComplete =0; + this.JointPre =0; + this.JointNoPre = 0; } } @@ -253,7 +301,15 @@ namespace FineUIPro.Web.HJGL.InfoQuery SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + var q = tb.AsEnumerable().Where(x => x["WeldingDate"].ToString() != ""); + var q2 = tb.AsEnumerable().Where(x => x["JointAttribute"].ToString() == "预制口"); + var sumcount= tb.Rows.Count; this.Grid1.RecordCount = tb.Rows.Count; + + this.JointComplete = q.Count(); + this.JointNoComplete = sumcount - JointComplete; + this.JointPre = q2.Count(); + this.JointNoPre = sumcount - JointPre; var table = this.GetPagedDataTable(Grid1, tb); Grid1.DataSource = table; Grid1.DataBind(); @@ -320,7 +376,8 @@ namespace FineUIPro.Web.HJGL.InfoQuery } protected void btnGetChart_Click(object sender, EventArgs e) { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("JointQueryChart.aspx?UnitWorkId={0}", tvControlItem.SelectedNodeID, "编辑 - "))); + + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("JointQueryChart.aspx?JointComplete={0}&&JointNoComplete={1}&&JointPre={2}&&JointNoPre={3}", JointComplete, JointNoComplete, JointPre, JointNoPre, "编辑 - "))); } #endregion diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx index 129c1eb3..366a9b74 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx @@ -65,7 +65,7 @@ - diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx index bb7fa3d7..b5a69da8 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx @@ -127,9 +127,11 @@ - + + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs index 3d7b3ab1..1e33a36d 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs @@ -257,6 +257,10 @@ namespace FineUIPro.Web.HJGL.PreDesign } protected void btnPrint_Click(object sender, EventArgs e) + { + Print(tvControlItem.SelectedNodeID,""); + } + private void Print(string PipelineId ,string PipelineComponentId) { BLL.FastReportService.ResetData(); @@ -274,8 +278,12 @@ namespace FineUIPro.Web.HJGL.PreDesign List listStr = new List { }; strSql += " AND com.PipelineId =@PipelineId"; - listStr.Add(new SqlParameter("@PipelineId", this.tvControlItem.SelectedNodeID)); - + listStr.Add(new SqlParameter("@PipelineId", PipelineId)); + if (PipelineComponentId!="") + { + strSql += " AND com.PipelineComponentId =@PipelineComponentId"; + listStr.Add(new SqlParameter("@PipelineComponentId", PipelineComponentId)); + } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); if (tb != null) @@ -446,7 +454,6 @@ namespace FineUIPro.Web.HJGL.PreDesign } return StateName; } - protected void btnImportQRCode_Click(object sender, EventArgs e) { PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("PrePipelineQRCodeIn.aspx?", "导入 - "))); @@ -497,10 +504,11 @@ namespace FineUIPro.Web.HJGL.PreDesign } } - - - - + } + else if (e.CommandName == "cmd_print") + { + string Id = this.Grid1.SelectedRowID; + Print(tvControlItem.SelectedNodeID, Id); } } diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx index daf72011..bf422a5e 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx @@ -11,14 +11,14 @@ - diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs index bd14b8ef..490f0fc9 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs @@ -1,175 +1,221 @@ using BLL; using System; +using System.Collections.Generic; using System.Configuration; using System.Data; +using System.Data.SqlClient; using System.Linq; +using System.Web.UI.DataVisualization.Charting; namespace FineUIPro.Web.HJGL.PreDesign { - public partial class YardPlanning : PageBase + public partial class YardPlanning : PageBase { #region 定义项 /// /// 主键 /// public string ProjectId - { - get { - return (string)ViewState["ProjectId"]; - } - set - { - ViewState["ProjectId"] = value; - } - } - #endregion - - /// - /// 加载页面 - /// - /// - /// - protected void Page_Load(object sender, EventArgs e) - { - if (!IsPostBack) - { - this.ProjectId = this.CurrUser.LoginProjectId; - if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId) + get { - this.ProjectId = Request.Params["projectId"]; + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + #endregion + + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ProjectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId) + { + this.ProjectId = Request.Params["projectId"]; + } + + ////权限按钮方法 + this.GetButtonPower(); + this.InitTreeMenu(); + Bind(); + } + } + private void Bind() + { + + if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID)) + { + var unit = HJGL_YardPlanningService.GetHJGL_YardPlanningByProjectId(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID); + this.imgPhoto.ImageUrl = null; + if (unit != null) + { + this.imgPhoto.ImageUrl = "~/" + unit.FlowChartPic; + + } + } + + + } + #region 加载树装置-单位-工作区 + /// + /// 加载树 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + + TreeNode rootNode1 = new TreeNode(); + rootNode1.NodeID = "1"; + rootNode1.Text = "建筑工程"; + rootNode1.CommandName = "建筑工程"; + rootNode1.Selectable = false; + this.tvControlItem.Nodes.Add(rootNode1); + + TreeNode rootNode2 = new TreeNode(); + rootNode2.NodeID = "2"; + rootNode2.Text = "安装工程"; + rootNode2.CommandName = "安装工程"; + rootNode2.Expanded = true; + this.tvControlItem.Nodes.Add(rootNode2); + + var pUnits = (from x in Funs.DB.Project_ProjectUnit where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); + // 获取当前用户所在单位 + var currUnit = pUnits.FirstOrDefault(x => x.UnitId == this.CurrUser.UnitId); + + var unitWorkList = (from x in Funs.DB.WBS_UnitWork + where x.ProjectId == this.CurrUser.LoginProjectId + && x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null + select x).ToList(); + + List unitWork1 = null; + List unitWork2 = null; + + // 当前为施工单位，只能操作本单位的数据 + if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + { + unitWork1 = (from x in unitWorkList + where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + select x).ToList(); + unitWork2 = (from x in unitWorkList + where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + select x).ToList(); + } + else + { + unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); + unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); } - ////权限按钮方法 - this.GetButtonPower(); - this.InitTreeMenu(); - Bind(); + if (unitWork1.Count() > 0) + { + foreach (var q in unitWork1) + { + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); + var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + TreeNode tn1 = new TreeNode(); + tn1.NodeID = q.UnitWorkId; + tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; + tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.EnableClickEvent = true; + rootNode1.Nodes.Add(tn1); + } + } + if (unitWork2.Count() > 0) + { + foreach (var q in unitWork2) + { + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); + var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + TreeNode tn2 = new TreeNode(); + tn2.NodeID = q.UnitWorkId; + // tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; + tn2.Text = q.UnitWorkName ; + tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.EnableClickEvent = true; + rootNode2.Nodes.Add(tn2); + } + } } - } - void Bind() + #endregion + + #region 点击TreeView + /// + /// 点击TreeView + /// + /// + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) { - var unit = HJGL_YardPlanningService.GetHJGL_YardPlanningByProjectId(this.CurrUser.LoginProjectId); + this.Bind(); + } + #endregion + + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + + var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.PersonId, BLL.Const.HJGL_YardPlanningMenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnAdd)) + { + this.btnNewItem.Hidden = false; + } + + if (buttonList.Contains(BLL.Const.BtnDelete)) + { + this.btnDeleteItem.Hidden = false; + } + } + } + #endregion + + + + + /// + /// 删除 + /// + /// + /// + protected void btnDelete_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID)) + { + var model = HJGL_YardPlanningService.GetHJGL_YardPlanningByProjectId(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID); + if (model != null) + { + HJGL_YardPlanningService.DeleteHJGL_YardPlanningById(model.YardPlanningId); + } this.imgPhoto.ImageUrl = null; - if (unit != null) + } + else { - this.imgPhoto.ImageUrl = "~/" + unit.FlowChartPic; + Alert.ShowInTop("请选择一个主项！", MessageBoxIcon.Warning); } + } - #region 加载树 - /// - /// 加载树 - /// - private void InitTreeMenu() - { - this.trSafetyOrganization.Nodes.Clear(); - TreeNode rootNode = new TreeNode + protected void filePhoto_FileSelected(object sender, EventArgs e) { - Text = "安全组织机构", - NodeID = "0", - Expanded = true - }; - this.trSafetyOrganization.Nodes.Add(rootNode); - BoundTree(rootNode.Nodes); - } - - /// - /// 加载树 - /// - /// - /// - private void BoundTree(TreeNodeCollection nodes) - { - var unitLists = BLL.ProjectUnitService.GetProjectUnitListByProjectId(this.ProjectId); - if (unitLists.Count() > 0) - { - if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId)) + if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID)) { - unitLists = unitLists.Where(x => x.UnitId == this.CurrUser.UnitId).ToList(); - } - - TreeNode tn = null; - foreach (var dr in unitLists) - { - tn = new TreeNode(); - var unitName = BLL.UnitService.GetUnitNameByUnitId(dr.UnitId); - if (unitName != null) - { - tn.Text = unitName; - } - tn.NodeID = dr.UnitId; - tn.EnableClickEvent = true; - - var gunitType = BLL.ConstValue.GetConstByConstValueAndGroupId(dr.UnitType, BLL.ConstValue.Group_ProjectUnitType); - if (gunitType != null) - { - tn.ToolTip = gunitType.ConstText + "：" + unitName; - } - //tn.ToolTip = "编号：" + dr.SafetyOrganizationCode + "；
机构名称：" + dr.SafetyOrganizationName + "；
职责：" + dr.Duties + "；
组成文件：" + dr.BundleFile + "；
机构人员：" + dr.AgencyPersonnel; - nodes.Add(tn); - } - } - } - #endregion - - - - #region 获取按钮权限 - /// - /// 获取按钮权限 - /// - /// - /// - private void GetButtonPower() - { - - var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.PersonId, BLL.Const.HJGL_YardPlanningMenuId); - if (buttonList.Count() > 0) - { - if (buttonList.Contains(BLL.Const.BtnAdd)) - { - this.btnNewItem.Hidden = false; - } - - if (buttonList.Contains(BLL.Const.BtnDelete)) - { - this.btnDeleteItem.Hidden = false; - } - } - } - #endregion - - - - - /// - /// 删除 - /// - /// - /// - protected void btnDelete_Click(object sender, EventArgs e) - { - //if (!string.IsNullOrEmpty(trSafetyOrganization.SelectedNodeID)) - //{ - var model = HJGL_YardPlanningService.GetHJGL_YardPlanningByProjectId(this.CurrUser.LoginProjectId); - if (model != null) - { - HJGL_YardPlanningService.DeleteHJGL_YardPlanningById(model.YardPlanningId); - } - this.imgPhoto.ImageUrl = null; - //} - //else - //{ - // Alert.ShowInTop("请选择一个单位！", MessageBoxIcon.Warning); - - //} - - } - protected void filePhoto_FileSelected(object sender, EventArgs e) - { - //if (!string.IsNullOrEmpty(trSafetyOrganization.SelectedNodeID)) - //{ - if (filePhoto.HasFile) + if (filePhoto.HasFile) { string rootUrl = ConfigurationManager.AppSettings["localRoot"]; if (string.IsNullOrEmpty(rootUrl)) @@ -192,57 +238,65 @@ namespace FineUIPro.Web.HJGL.PreDesign fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_"); fileName = DateTime.Now.Ticks.ToString() + "_" + fileName; - + filePhoto.SaveAs(rootUrl + "/FileUpload/HJGL_YardPlanning/" + fileName); imgPhoto.ImageUrl = "~/FileUpload/HJGL_YardPlanning/" + fileName; - HJGL_YardPlanningService.SavePic(this.CurrUser.LoginProjectId, "FileUpload/HJGL_YardPlanning/" + fileName); + HJGL_YardPlanningService.SavePic(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, "FileUpload/HJGL_YardPlanning/" + fileName); // 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！） filePhoto.Reset(); } - //} - //else - //{ - // Alert.ShowInTop("请选择一个单位！", MessageBoxIcon.Warning); + } + else + { + Alert.ShowInTop("请选择一个主项！", MessageBoxIcon.Warning); - //} - } + } + } - /// - /// Tree点击事件 - /// - /// - /// - protected void trSafetyOrganization_NodeCommand(object sender, TreeCommandEventArgs e) - { - if (!string.IsNullOrEmpty(trSafetyOrganization.SelectedNodeID)) + /// + /// Tree点击事件 + /// + /// + /// + protected void trSafetyOrganization_NodeCommand(object sender, TreeCommandEventArgs e) { - var unit = HJGL_YardPlanningService.GetHJGL_YardPlanningByProjectId(this.CurrUser.LoginProjectId); + if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID)) + { + var unit = HJGL_YardPlanningService.GetHJGL_YardPlanningByProjectId(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID); this.imgPhoto.ImageUrl = null; if (unit != null) { this.imgPhoto.ImageUrl = "~/" + unit.FlowChartPic; } + } + else + { + this.imgPhoto.ImageUrl = null; + } } - else - { - this.imgPhoto.ImageUrl = null; - } - } protected void btnAttachUrl_Click(object sender, EventArgs e) { - var model = HJGL_YardPlanningService.GetHJGL_YardPlanningByProjectId(this.CurrUser.LoginProjectId); - if (model==null) + if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID)) { - HJGL_YardPlanningService.SavePic(this.CurrUser.LoginProjectId,""); - model = HJGL_YardPlanningService.GetHJGL_YardPlanningByProjectId(this.CurrUser.LoginProjectId); + var model = HJGL_YardPlanningService.GetHJGL_YardPlanningByProjectId(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID); + if (model == null) + { + HJGL_YardPlanningService.SavePic(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, ""); + model = HJGL_YardPlanningService.GetHJGL_YardPlanningByProjectId(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/HJGL_YardPlanning&menuId={1}", model.YardPlanningId, BLL.Const.HJGL_YardPlanningMenuId))); + } + else + { + Alert.ShowInTop("请选择一个主项！", MessageBoxIcon.Warning); + } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/HJGL_YardPlanning&menuId={1}", model.YardPlanningId, BLL.Const.HJGL_YardPlanningMenuId))); } } @@ -359,7 +413,7 @@ namespace FineUIPro.Web.HJGL.PreDesign // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("EmergencyProcessEdit.aspx?EmergencyProcessId={0}", Grid1.SelectedRowID, "详细 - "))); // } // #endregion - + // #region 获取按钮权限 // /// // /// 获取按钮权限 diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.designer.cs index 24f31f46..a4cb8006 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.designer.cs @@ -60,13 +60,13 @@ namespace FineUIPro.Web.HJGL.PreDesign protected global::FineUIPro.Panel panelLeftRegion; /// - /// trSafetyOrganization 控件。 + /// tvControlItem 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Tree trSafetyOrganization; + protected global::FineUIPro.Tree tvControlItem; /// /// panelCenterRegion 控件。 diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineFinish.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineFinish.aspx index f9fb4cac..f4c64769 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineFinish.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineFinish.aspx @@ -46,12 +46,12 @@ - + - + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointBatchEdit.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointBatchEdit.aspx index 35766fcc..d264ecc8 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointBatchEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointBatchEdit.aspx @@ -103,7 +103,7 @@ - <%-- --%> - private void SaveData() { - if (this.drpPipingClass.SelectedValue == BLL.Const._Null || this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null || this.drpWeldTypeCode.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.hdWeldingMethodId.Text) || string.IsNullOrEmpty(this.txtWpqId.Text.Trim())) + // if (this.drpPipingClass.SelectedValue == BLL.Const._Null || this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null || this.drpWeldTypeCode.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.hdWeldingMethodId.Text) || string.IsNullOrEmpty(this.txtWpqId.Text.Trim())) + if (string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()) || this.drpPipingClass.SelectedValue == BLL.Const._Null || this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null || this.drpWeldTypeCode.SelectedValue == BLL.Const._Null) + { Alert.ShowInTop("页面必填项不能为空", MessageBoxIcon.Warning); Alert.ShowInTop("请完善必填项！", MessageBoxIcon.Warning); @@ -266,11 +269,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage } else { - if (this.txtWeldJointCode.Text.Contains("G")) - { - Alert.ShowInTop("焊口编号不能包含G！", MessageBoxIcon.Warning); - return; - } + //if (this.txtWeldJointCode.Text.Contains("G")) + //{ + // Alert.ShowInTop("焊口编号不能包含G！", MessageBoxIcon.Warning); + // return; + //} joint.WeldJointCode = this.txtWeldJointCode.Text; } @@ -323,26 +326,28 @@ namespace FineUIPro.Web.HJGL.WeldingManage { joint.DetectionTypeId = this.drpDetectionTypeId.SelectedValue; } - bool flag = false; - if (Convert.ToBoolean(drpDesignIsHotProess.SelectedValue)) - { - flag = true; - } - if (flag) - { - joint.IsHotProess = true; - } - else - { - joint.IsHotProess = false; - } + //bool flag = false; + //if (Convert.ToBoolean(drpDesignIsHotProess.SelectedValue)) + //{ + // flag = true; + //} + //if (flag) + //{ + // joint.IsHotProess = true; + //} + //else + //{ + // joint.IsHotProess = false; + //} + //joint.IsHotProess = Convert.ToBoolean(drpIsHotProess.SelectedValue); + //joint.DesignIsHotProess = Convert.ToBoolean(drpDesignIsHotProess.SelectedValue); + joint.Remark = txtRemark.Text.Trim(); + joint.SubmitMan = CurrUser.PersonId; + if (!string.IsNullOrEmpty(this.txtWpqId.Text)) { joint.WPQId = this.txtWpqId.Text; } - joint.IsHotProess = Convert.ToBoolean(drpIsHotProess.SelectedValue); - joint.DesignIsHotProess = Convert.ToBoolean(drpDesignIsHotProess.SelectedValue); - joint.Remark = txtRemark.Text.Trim(); if (Request.Params["IsTwoJoint"] == "1") { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs index 9e7b2941..5b2cdc5b 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs @@ -313,8 +313,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage joint.PipelineCode = txtPipelineCode.Text.Trim(); joint.ProjectId = this.CurrUser.LoginProjectId; - if (!this.txtWeldJointCode.Text.Contains("G")) - { + //if (!this.txtWeldJointCode.Text.Contains("G")) + //{ int jointCode = Funs.GetNewIntOrZero(this.txtWeldJointCode.Text.Trim()); if (jointCode != 0) { @@ -331,12 +331,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage { joint.WeldJointCode = this.txtWeldJointCode.Text; } - } - else - { - Alert.ShowInTop("焊口编号不能包含G！", MessageBoxIcon.Warning); - return; - } + //} + //else + //{ + // Alert.ShowInTop("焊口编号不能包含G！", MessageBoxIcon.Warning); + // return; + //} if (this.drpMaterial1.SelectedValue != BLL.Const._Null) { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs index 10370b04..0f8a2586 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs @@ -195,6 +195,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) { + Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID); this.hdUnitWorkId.Text = string.Empty; if (pipeline != null) @@ -202,7 +203,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID; this.BindGrid(); } - lbPlanStartDate.Text = pipeline.PlanStartDate.HasValue ? pipeline.PlanStartDate.Value.ToShortDateString() : ""; + if (PipeArea == PipelineService.PipeArea_SHOP) + { + var list= BLL.HJGL_PipelineComponentService.GetComponentByPipelineId(pipeline.PipelineId); + if (list!=null&&list.Count()>0) + { + + lbPlanStartDate.Text = list.First().PlanStartDate.ToString () ; + } + } + else if (PipeArea == PipelineService.PipeArea_FIELD) + { + lbPlanStartDate.Text = pipeline.PlanStartDate.HasValue ? pipeline.PlanStartDate.Value.ToShortDateString() : ""; + + } //if (pipeline.PlanStartDate.HasValue && pipeline.ActStartDate.HasValue) //{ // if (pipeline.ActStartDate < pipeline.PlanStartDate) diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs index d70895cb..9ac609ba 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs @@ -124,7 +124,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); parameter3D.ColorModel = colorModel; parameter3D.TagNum = ""; - parameter3D.ButtonType = "0,1"; + parameter3D.ButtonType = "0"; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName; @@ -294,7 +294,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); parameter3D.ColorModel = colorModel; parameter3D.TagNum = pipecode; - parameter3D.ButtonType = "0,1"; + parameter3D.ButtonType = "0"; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName; ctlAuditFlow.data = parameter3D; diff --git a/SGGL/Model/APIItem/HJGL/PackagingManageItem.cs b/SGGL/Model/APIItem/HJGL/PackagingManageItem.cs index fe700660..7bb3e3a2 100644 --- a/SGGL/Model/APIItem/HJGL/PackagingManageItem.cs +++ b/SGGL/Model/APIItem/HJGL/PackagingManageItem.cs @@ -18,7 +18,7 @@ namespace Model public int? State { get; set; } public string ReceiveMan { get; set; } - public DateTime? ReceiveDate { get; set; } + public string ReceiveDate { get; set; } } @@ -27,7 +27,7 @@ namespace Model public string PipelineComponentCode { get; set; } public string PreUnit { get; set; } public string UnitWorkName { get; set; } - public DateTime? PlanStartDate { get; set; } + public string PlanStartDate { get; set; } } public class PackagingManageItem diff --git a/SGGL/Model/APIItem/HJGL/PipelineComponentItem.cs b/SGGL/Model/APIItem/HJGL/PipelineComponentItem.cs index 77bd34f2..acf402b9 100644 --- a/SGGL/Model/APIItem/HJGL/PipelineComponentItem.cs +++ b/SGGL/Model/APIItem/HJGL/PipelineComponentItem.cs @@ -14,10 +14,10 @@ namespace Model public string DrawingName { get; set; } public string BoxNumber { get; set; } public int? State { get; set; } - public DateTime? PlanStartDate { get; set; } + public string PlanStartDate { get; set; } public string QRCode { get; set; } public string ReceiveMan { get; set; } - public DateTime? ReceiveDate { get; set; } + public string ReceiveDate { get; set; } } public class PipelineComponentDetail { diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 2012bc11..76ecd34e 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -79684,6 +79684,8 @@ namespace Model private string _FlowChartPic; + private string _UnitWorkId; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -79696,6 +79698,8 @@ namespace Model partial void OnRemarkChanged(); partial void OnFlowChartPicChanging(string value); partial void OnFlowChartPicChanged(); + partial void OnUnitWorkIdChanging(string value); + partial void OnUnitWorkIdChanged(); #endregion public HJGL_YardPlanning() @@ -79783,6 +79787,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkId", DbType="VarChar(50)")] + public string UnitWorkId + { + get + { + return this._UnitWorkId; + } + set + { + if ((this._UnitWorkId != value)) + { + this.OnUnitWorkIdChanging(value); + this.SendPropertyChanging(); + this._UnitWorkId = value; + this.SendPropertyChanged("UnitWorkId"); + this.OnUnitWorkIdChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged;