提交代码
This commit is contained in:
parent
55b52e460a
commit
60d29ffb4e
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -544,7 +544,7 @@ namespace FineUIPro.Web.CQMS.WBS
|
|||
name = string.Empty;
|
||||
if (!string.IsNullOrEmpty(txtName.Trim()))
|
||||
{
|
||||
name = "-" + txtName.Trim();
|
||||
name = "-" + txtName.Trim().Replace("&#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("&#215;", "×");
|
||||
}
|
||||
Model.WBS_WorkPackageProject workPackageProject = BLL.WorkPackageProjectService.GetWorkPackageProjectByWorkPackageCode(workPackageCode2, this.CurrUser.LoginProjectId);
|
||||
if (ckbWorkPackageCode.Checked)
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
@ -188,7 +189,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
}
|
||||
|
||||
//e.Node.Nodes.Clear();
|
||||
|
||||
|
||||
//if (e.Node.CommandName == "单位工程")
|
||||
//{
|
||||
// var pipeline = (from x in Funs.DB.HJGL_Pipeline
|
||||
|
|
@ -196,7 +197,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
// orderby x.PipelineCode
|
||||
// select x).ToList();
|
||||
// var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
|
||||
|
||||
|
||||
// // var WeldJointlist = (from x in Funs.DB.View_HJGL_WeldJoint where x.UnitWorkId == e.Node.NodeID && x.IsTwoJoint == null select x).ToList();
|
||||
|
||||
// foreach (var item in pipeline)
|
||||
|
|
@ -210,7 +211,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
// e.Node.Nodes.Add(newNode);
|
||||
|
||||
// }
|
||||
|
||||
|
||||
//}
|
||||
}
|
||||
|
||||
|
|
@ -266,7 +267,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
this.lbFiledSum.Text = FieldSum;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#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,14 +443,14 @@ 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;
|
||||
}
|
||||
return "0%";
|
||||
|
|
@ -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;
|
||||
|
|
@ -529,7 +530,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
var a = (decimal)100 * proSum / AllSum;
|
||||
rate = Math.Round((decimal)a, 1).ToString() + "%";
|
||||
}
|
||||
|
||||
|
||||
return rate;
|
||||
}
|
||||
return "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))
|
||||
|
|
|
|||
|
|
@ -7,13 +7,11 @@
|
|||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
|
||||
|
||||
public partial class WeldJointList
|
||||
{
|
||||
|
||||
namespace FineUIPro.Web.HJGL.WeldingManage {
|
||||
|
||||
|
||||
public partial class WeldJointList {
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -22,7 +20,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// PageManager1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -31,7 +29,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.PageManager PageManager1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Panel1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -40,7 +38,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel Panel1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// panelLeftRegion 控件。
|
||||
/// </summary>
|
||||
|
|
@ -49,7 +47,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel panelLeftRegion;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -58,7 +56,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// tvPipeCode 控件。
|
||||
/// </summary>
|
||||
|
|
@ -67,7 +65,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox tvPipeCode;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// hdUnitWorkId 控件。
|
||||
/// </summary>
|
||||
|
|
@ -76,7 +74,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.HiddenField hdUnitWorkId;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnTreeFind 控件。
|
||||
/// </summary>
|
||||
|
|
@ -85,7 +83,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnTreeFind;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// tvControlItem 控件。
|
||||
/// </summary>
|
||||
|
|
@ -94,7 +92,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Tree tvControlItem;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Panel2 控件。
|
||||
/// </summary>
|
||||
|
|
@ -103,7 +101,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel Panel2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// panelCenterRegion 控件。
|
||||
/// </summary>
|
||||
|
|
@ -112,7 +110,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel panelCenterRegion;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar3 控件。
|
||||
/// </summary>
|
||||
|
|
@ -121,7 +119,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar3;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtWeldJointCode 控件。
|
||||
/// </summary>
|
||||
|
|
@ -130,7 +128,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtWeldJointCode;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtMaterialCode 控件。
|
||||
/// </summary>
|
||||
|
|
@ -139,7 +137,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtMaterialCode;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -148,7 +146,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnNew 控件。
|
||||
/// </summary>
|
||||
|
|
@ -157,7 +155,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnNew;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnPrint 控件。
|
||||
/// </summary>
|
||||
|
|
@ -166,7 +164,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnPrint;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnImport 控件。
|
||||
/// </summary>
|
||||
|
|
@ -175,7 +173,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnImport;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnUpdateImport 控件。
|
||||
/// </summary>
|
||||
|
|
@ -184,7 +182,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnUpdateImport;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnPDMSImport 控件。
|
||||
/// </summary>
|
||||
|
|
@ -193,7 +191,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnPDMSImport;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnMatImport 控件。
|
||||
/// </summary>
|
||||
|
|
@ -202,7 +200,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnMatImport;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar2 控件。
|
||||
/// </summary>
|
||||
|
|
@ -211,7 +209,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// lbSinglePreRate 控件。
|
||||
/// </summary>
|
||||
|
|
@ -220,7 +218,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbSinglePreRate;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// lbShopSize 控件。
|
||||
/// </summary>
|
||||
|
|
@ -229,7 +227,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbShopSize;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// lbFiledSize 控件。
|
||||
/// </summary>
|
||||
|
|
@ -238,7 +236,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbFiledSize;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Label2 控件。
|
||||
/// </summary>
|
||||
|
|
@ -247,7 +245,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label Label2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// lbSinglePreRateByWeldJoint 控件。
|
||||
/// </summary>
|
||||
|
|
@ -256,7 +254,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbSinglePreRateByWeldJoint;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// lbShopSum 控件。
|
||||
/// </summary>
|
||||
|
|
@ -265,7 +263,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbShopSum;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// lbFiledSum 控件。
|
||||
/// </summary>
|
||||
|
|
@ -274,7 +272,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbFiledSum;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -283,7 +281,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid Grid1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Label1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -292,7 +290,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label Label1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// panelBottomRegion 控件。
|
||||
/// </summary>
|
||||
|
|
@ -301,7 +299,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel panelBottomRegion;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// TabStrip1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -310,7 +308,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TabStrip TabStrip1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// TabJoint 控件。
|
||||
/// </summary>
|
||||
|
|
@ -319,7 +317,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Tab TabJoint;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Grid3 控件。
|
||||
/// </summary>
|
||||
|
|
@ -328,7 +326,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid Grid3;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// TabPipeMat 控件。
|
||||
/// </summary>
|
||||
|
|
@ -337,7 +335,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Tab TabPipeMat;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Grid2 控件。
|
||||
/// </summary>
|
||||
|
|
@ -346,7 +344,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid Grid2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Window1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -355,7 +353,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Window2 控件。
|
||||
/// </summary>
|
||||
|
|
@ -364,7 +362,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Window3 控件。
|
||||
/// </summary>
|
||||
|
|
@ -373,7 +371,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window3;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Window4 控件。
|
||||
/// </summary>
|
||||
|
|
@ -382,7 +380,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window4;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Window5 控件。
|
||||
/// </summary>
|
||||
|
|
@ -391,7 +389,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window5;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Menu1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -400,7 +398,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Menu Menu1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuPipeLineEdit 控件。
|
||||
/// </summary>
|
||||
|
|
@ -409,7 +407,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnMenuPipeLineEdit;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuPipeLineDelete 控件。
|
||||
/// </summary>
|
||||
|
|
@ -418,7 +416,25 @@ 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>
|
||||
|
|
@ -427,7 +443,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Menu Menu2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnDelMat 控件。
|
||||
/// </summary>
|
||||
|
|
@ -436,7 +452,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnDelMat;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Menu3 控件。
|
||||
/// </summary>
|
||||
|
|
@ -445,7 +461,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Menu Menu3;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuEdit 控件。
|
||||
/// </summary>
|
||||
|
|
@ -454,7 +470,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnMenuEdit;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuInsert 控件。
|
||||
/// </summary>
|
||||
|
|
@ -463,7 +479,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnMenuInsert;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnView 控件。
|
||||
/// </summary>
|
||||
|
|
@ -472,7 +488,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnView;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuDelete 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
Loading…
Reference in New Issue