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

提交代码

Browse Source
This commit is contained in:
高飞
2023-11-22 16:06:58 +08:00
parent 55b52e460a
commit 60d29ffb4e
8 changed files with 210 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HJGL/WPQ/WPQListService.cs
+4 -1
View File
@@ -202,7 +202,10 @@ namespace BLL
var mat1 = BLL.Base_MaterialService.GetMaterialByMaterialId(material1);
var mat2 = BLL.Base_MaterialService.GetMaterialByMaterialId(material2);
if (mat1.MaterialCode == "No matl" || mat2.MaterialCode == "No matl") //材质1或材质2有一种为无材质，则匹配不了wpq
{
return null;
}
int m1 = SNClass(mat1.MaterialClass);
int m2 = SNClass(mat2.MaterialClass);
SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
+1 -1
View File
@@ -841,7 +841,7 @@ namespace BLL
{
if (isExitWPQId)
{
string strSql = "SELECT distinct PipelineId, PipelineCode FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL AND UnitWorkId =@UnitWorkId AND WPQId IS NULL";
string strSql = "SELECT distinct PipelineId, PipelineCode FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL AND UnitWorkId =@UnitWorkId AND WPQId IS NULL order by PipelineCode";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@UnitWorkId", node.NodeID));
if (!string .IsNullOrEmpty(pipecode))
SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.cs
+2 -2
View File
@@ -544,7 +544,7 @@ namespace FineUIPro.Web.CQMS.WBS
name = string.Empty;
if (!string.IsNullOrEmpty(txtName.Trim()))
{
name = "-" + txtName.Trim();
name = "-" + txtName.Trim().Replace("&amp;#215;", "×");
}
if (!string.IsNullOrEmpty(name))
{
@@ -644,7 +644,7 @@ namespace FineUIPro.Web.CQMS.WBS
name = string.Empty;
if (!string.IsNullOrEmpty(txtName.Trim()))
{
name = "-" + txtName.Trim();
name = "-" + txtName.Trim().Replace("&amp;#215;", "×");
}
Model.WBS_WorkPackageProject workPackageProject = BLL.WorkPackageProjectService.GetWorkPackageProjectByWorkPackageCode(workPackageCode2, this.CurrUser.LoginProjectId);
if (ckbWorkPackageCode.Checked)
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx
+21 -4
View File
@@ -11,7 +11,8 @@
color: red;
font-weight: bold;
}
.customlabelNum span {
.customlabelNum span {
color: blue;
font-weight: bold;
}
@@ -45,6 +46,9 @@
OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
AutoLeafIdentification="true"
EnableTextSelection="true" OnNodeExpand="tvControlItem_TreeNodeExpanded">
<Listeners>
<f:Listener Event="beforenodecontextmenu" Handler="onTreeNodeContextMenu" />
</Listeners>
</f:Tree>
</Items>
</f:Panel>
@@ -99,10 +103,10 @@
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:Label ID="lbSinglePreRate" CssClass="customlabel" runat="server" Label="主项预制率(达因)" LabelWidth="140"></f:Label>
<f:Label ID="lbSinglePreRate" CssClass="customlabel" runat="server" Label="主项预制率(达因)" LabelWidth="140"></f:Label>
<f:Label ID="lbShopSize" CssClass="customlabel" runat="server" Label="预制口达因" LabelWidth="100"></f:Label>
<f:Label ID="lbFiledSize" CssClass="customlabel" runat="server" Label="安装口达因" LabelWidth="100"></f:Label>
<f:Label ID="Label2" runat="server" LabelWidth="100"></f:Label>
<f:Label ID="Label2" runat="server" LabelWidth="100"></f:Label>
<f:Label ID="lbSinglePreRateByWeldJoint" CssClass="customlabelNum" runat="server" Label="主项预制率(焊口)" LabelWidth="140"></f:Label>
<f:Label ID="lbShopSum" CssClass="customlabelNum" runat="server" Label="预制口数量" LabelWidth="140"></f:Label>
<f:Label ID="lbFiledSum" CssClass="customlabelNum" runat="server" Label="安装口数量" LabelWidth="140"></f:Label>
@@ -197,7 +201,7 @@
FieldType="String" HeaderText="材质" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="FlowingSection" DataField="FlowingSection" SortField="FlowingSection"
<f:RenderField Width="100px" ColumnID="FlowingSection" DataField="FlowingSection" SortField="FlowingSection"
FieldType="String" HeaderText="流水段" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
@@ -527,6 +531,12 @@
Text="删除" Icon="Delete">
</f:MenuButton>
</f:Menu>
<f:Menu ID="Menu4" runat="server">
<f:MenuButton ID="btnMenuPipeLineAllDelete" OnClick="btnMenuPipeLineAllDelete_Click" EnablePostBack="true"
ConfirmText="删除选中管线？" ConfirmTarget="Top" runat="server"
Text="删除" Icon="Delete">
</f:MenuButton>
</f:Menu>
<f:Menu ID="Menu2" runat="server">
<f:MenuButton ID="btnDelMat" OnClick="btnDelMat_Click" EnablePostBack="true"
ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server"
@@ -553,6 +563,7 @@
var menuID1 = '<%= Menu1.ClientID %>';
var menuID2 = '<%= Menu2.ClientID %>';
var menuID3 = '<%= Menu3.ClientID %>';
var menuID4 = '<%= Menu4.ClientID %>';
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu1(event, rowId) {
F(menuID1).show(); //showAt(event.pageX, event.pageY);
@@ -570,6 +581,12 @@
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
// 返回false，来阻止浏览器右键菜单
function onTreeNodeContextMenu(event, rowId) {
F(menuID4).show(); //showAt(event.pageX, event.pageY);
return false;
}
</script>
</body>
</html>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
+83 -49
View File
@@ -17,7 +17,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
public partial class WeldJointList : PageBase
{
public int pageSize = PipelineService.pageSize;
public static List<Model.HJGL_WeldJoint> WeldJointlist = new List<Model.HJGL_WeldJoint>();
public static List<Model.HJGL_WeldJoint> WeldJointlist = new List<Model.HJGL_WeldJoint>();
/// <summary>
/// 预制口总达因
/// </summary>
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (!IsPostBack)
{
// WeldJointlist = WeldJointService.GetWeldJointByProjectid(this.CurrUser.LoginProjectId);
// WeldJointlist = WeldJointService.GetWeldJointByProjectid(this.CurrUser.LoginProjectId);
this.InitTreeMenu();//加载树
//显示列
//Model.Sys_UserShowColumns c = BLL.UserShowColumnsService.GetColumnsByUserId(this.CurrUser.PersonId, "Joint");
@@ -111,8 +111,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
//}
//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();
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
//}
if (unitWork1.Count() > 0)
@@ -143,8 +143,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
foreach (var q in unitWork2)
{
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId
&& x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
int a = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId
&& x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
select x).Count();
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode();
@@ -157,7 +158,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn2.EnableExpandEvent = true;
tn2.EnableClickEvent= true;
tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2);
if (a > 0)
{
@@ -175,7 +176,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
#region
private void BindNodes(TreeNode node)
{
BLL.PipelineService.BindTreeNodes(node, this.tvPipeCode.Text.Trim(), this.CurrUser.LoginProjectId,pageSize);
BLL.PipelineService.BindTreeNodes(node, this.tvPipeCode.Text.Trim(), this.CurrUser.LoginProjectId, pageSize);
}
#endregion
@@ -411,29 +412,29 @@ namespace FineUIPro.Web.HJGL.WeldingManage
#endregion
#region 预制率计算
private string GetRateByUnitWork(string unitworkid)
private string GetRateByUnitWork(string unitworkid)
{
var db = Funs.DB;
var q=from x in db.View_HJGL_WeldJoint where x.UnitWorkId == unitworkid select x ;
var q = from x in db.View_HJGL_WeldJoint where x.UnitWorkId == unitworkid select x;
string rate = "";
ShopSumSize = "0";
FieldSumSize = "0";
if (q!=null&&q.Count()>0)
if (q != null && q.Count() > 0)
{
var proSum = (from x in q
where x.JointAttribute == "预制口"
where x.JointAttribute == "预制口"
group x by x.UnitWorkId into g
select new
{
SizeSum = g.Sum(x => x.Size)
}).FirstOrDefault()?.SizeSum;
var FieldSum = (from x in q
where x.JointAttribute == "安装口"
group x by x.UnitWorkId into g
select new
{
SizeSum = g.Sum(x => x.Size)
}).FirstOrDefault()?.SizeSum;
where x.JointAttribute == "安装口"
group x by x.UnitWorkId into g
select new
{
SizeSum = g.Sum(x => x.Size)
}).FirstOrDefault()?.SizeSum;
var AllSum = (from x in q
group x by x.UnitWorkId into g
select new
@@ -442,12 +443,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}).FirstOrDefault()?.SizeSum;
proSum = (proSum != null) ? proSum : 0;
FieldSum = (FieldSum != null) ? FieldSum : 0;
ShopSumSize = proSum.ToString() ;
FieldSumSize = FieldSum.ToString() ;
if (AllSum>0)
ShopSumSize = proSum.ToString();
FieldSumSize = FieldSum.ToString();
if (AllSum > 0)
{
var a = (decimal)100 * proSum / AllSum;
rate = Math.Round((decimal)a, 1).ToString()+"%";
rate = Math.Round((decimal)a, 1).ToString() + "%";
}
return rate;
@@ -496,28 +497,28 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var q = from x in db.View_HJGL_WeldJoint where x.PipelineId == pipelineid select x;
if (q != null && q.Count() > 0)
{
var proSumModel= (from x in q
where x.JointAttribute == "预制口"
group x by x.PipelineId into g
select new
{
SizeSum = g.Sum(x => x.Size)
}).FirstOrDefault();
var proSum= (proSumModel !=null) ? proSumModel.SizeSum : 0;
var proSumModel = (from x in q
where x.JointAttribute == "预制口"
group x by x.PipelineId into g
select new
{
SizeSum = g.Sum(x => x.Size)
}).FirstOrDefault();
var proSum = (proSumModel != null) ? proSumModel.SizeSum : 0;
var FieldSumModel = (from x in q
where x.JointAttribute == "安装口"
group x by x.PipelineId into g
select new
{
SizeSum = g.Sum(x => x.Size)
}).FirstOrDefault();
var FieldSum= (FieldSumModel != null) ? FieldSumModel.SizeSum : 0;
where x.JointAttribute == "安装口"
group x by x.PipelineId into g
select new
{
SizeSum = g.Sum(x => x.Size)
}).FirstOrDefault();
var FieldSum = (FieldSumModel != null) ? FieldSumModel.SizeSum : 0;
var AllSumModel = (from x in q
group x by x.PipelineId into g
select new
{
SizeSum = g.Sum(x => x.Size)
}).FirstOrDefault();
group x by x.PipelineId into g
select new
{
SizeSum = g.Sum(x => x.Size)
}).FirstOrDefault();
var AllSum = (AllSumModel != null) ? AllSumModel.SizeSum : 0;
proSum = (proSum != null) ? proSum : 0;
@@ -549,13 +550,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var q = from x in db.View_HJGL_WeldJoint where x.PipelineId == pipelineid select x;
if (q != null && q.Count() > 0)
{
shopNum = (from x in q
where x.JointAttribute == "预制口" select x
).Count();
fieldNum = (from x in q
where x.JointAttribute == "安装口"
select x
).Count();
shopNum = (from x in q
where x.JointAttribute == "预制口"
select x
).Count();
fieldNum = (from x in q
where x.JointAttribute == "安装口"
select x
).Count();
ShopSum = shopNum.ToString();
FieldSum = fieldNum.ToString();
AllNum = shopNum + fieldNum;
@@ -765,6 +767,38 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
protected void btnMenuPipeLineAllDelete_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldJointMenuId, Const.BtnDelete))
{
if (this.tvControlItem.SelectedNode.CommandName != "管线")
{
Alert.ShowInTop("请选择一条管线！", MessageBoxIcon.Warning);
return;
}
string pipelineId = this.tvControlItem.SelectedNodeID;
var weldJoints = from x in Funs.DB.HJGL_WeldJoint
where x.PipelineId == pipelineId && x.WeldingDailyId != null
select x;
if (weldJoints.Count() > 0)
{
Alert.ShowInTop("存在已焊接的焊口，无法删除管线！", MessageBoxIcon.Warning);
return;
}
BLL.WeldJointService.DeleteWeldJointByPipelineId(pipelineId);
BLL.PipelineService.DeletePipeline(pipelineId);
//BLL.Sys_LogService.AddLog(BLL.Const.System_6, this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_PipelineMenuId, Const.BtnDelete, rowID);
ShowNotify("删除成功！", MessageBoxIcon.Success);
this.InitTreeMenu();
}
else
{
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
}
}
protected void btnDelMat_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldJointMenuId, Const.BtnDelete))
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.designer.cs
Generated
+20 -4
View File
@@ -7,12 +7,10 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingManage
{
namespace FineUIPro.Web.HJGL.WeldingManage {
public partial class WeldJointList
{
public partial class WeldJointList {
/// <summary>
/// form1 控件。
@@ -419,6 +417,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuPipeLineDelete;
/// <summary>
/// Menu4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu4;
/// <summary>
/// btnMenuPipeLineAllDelete 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuPipeLineAllDelete;
/// <summary>
/// Menu2 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+2 -2
View File
@@ -251,8 +251,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
else
{
this.Grid1.Columns[12].Hidden = false;
this.btnSave.Hidden = false;
//this.Grid1.Columns[12].Hidden = false;
//this.btnSave.Hidden = false;
}
}
#endregion
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs
+17 -3
View File
@@ -375,15 +375,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
{
var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == tvControlItem.SelectedNodeID &&x.JointAttribute==drpJointAttribute.SelectedValue && x.WPQId == null select x;
var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == tvControlItem.SelectedNodeID &&x.JointAttribute==drpJointAttribute.SelectedValue select x;
if (jotList.Count() > 0)
{
foreach (var jot in jotList)
{
List<Model.View_HJGL_WPQ> wpqList =BLL.WPQListServiceService.GetMatchWPQ(jot,this.CurrUser.LoginProjectId, drpUnit.SelectedValue);
Model.HJGL_WeldJoint newJot = new Model.HJGL_WeldJoint();
if (wpqList != null)
{
Model.HJGL_WeldJoint newJot = new Model.HJGL_WeldJoint();
Model.WPQ_WPQList wps = BLL.WPQListServiceService.GetWPQById(wpqList.First().WPQId);
newJot.WPQId = wps.WPQId;
@@ -396,8 +397,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
newJot.IsHotProess = wps.IsHotProess;
newJot.MatchableWPQ = string.Join(",", wpqList.Select(x => x.WPQCode));
BLL.WeldJointService.UpdateConWeldJoint(newJot);
}
else
{
newJot.WPQId = null;
newJot.WeldJointId = jot.WeldJointId;
newJot.WeldingRod = null;
newJot.WeldingWire = null;
newJot.WeldingMethodId = null;
newJot.GrooveTypeId = null;
newJot.PreTemperature = null;
newJot.IsHotProess = null;
newJot.MatchableWPQ = null;
}
BLL.WeldJointService.UpdateConWeldJoint(newJot);
}
}
BindGrid();