shecs/Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
佘春生
2024-10-10 10:35:01 +08:00
parent 94fc0c6aa5
commit 022aebc00d
45 changed files with 1525 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs
+67 -12
View File
@@ -235,12 +235,22 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
if (selectedRowIDArray.Length > 0)
{
string strSql = @"SELECT pItem.PointBatchId,jot.WeldingMethodId,jot.GrooveTypeId,
(CASE WHEN pItem.IsWelderFirst=1 THEN 1 ELSE 0 END) AS IsWelderFirst
(CASE WHEN pItem.IsWelderFirst=1 THEN 1 ELSE 0 END) AS IsWelderFirst,
pItem.PointState,NULL AS RepairRecordId
FROM Batch_PointBatchItem AS pItem
LEFT JOIN Pipeline_WeldJoint AS jot ON jot.WeldJointId=pItem.WeldJointId
WHERE CHARINDEX(PointBatchItemId,@PointBatchItemList)>0
GROUP BY pItem.PointBatchId, jot.WeldingMethodId,jot.GrooveTypeId,
(CASE WHEN pItem.IsWelderFirst=1 THEN 1 ELSE 0 END)";
WHERE CHARINDEX(PointBatchItemId,@PointBatchItemList)>0 AND
pItem.PointState='1'
GROUP BY pItem.PointBatchId, pItem.PointState, jot.WeldingMethodId,jot.GrooveTypeId,
(CASE WHEN pItem.IsWelderFirst=1 THEN 1 ELSE 0 END)
UNION ALL
SELECT pItem.PointBatchId, MAX(jot.WeldingMethodId) AS WeldingMethodId,MAX(jot.GrooveTypeId) AS GrooveTypeId ,
0 AS IsWelderFirst, pItem.PointState, pItem.RepairRecordId
FROM Batch_PointBatchItem AS pItem
LEFT JOIN Pipeline_WeldJoint AS jot ON jot.WeldJointId=pItem.WeldJointId
WHERE CHARINDEX(PointBatchItemId,@PointBatchItemList)>0 AND
pItem.PointState<>'1'
GROUP BY pItem.PointBatchId,pItem.PointState,pItem.RepairRecordId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@PointBatchItemList", PointBatchItemList));
@@ -258,10 +268,39 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
var work = BLL.Project_WorkAreaService.GetProject_WorkAreaByWorkAreaId(iso.WorkAreaId);
Model.Batch_BatchTrust newBatchTrust = new Model.Batch_BatchTrust();
string perfix = string.Empty;
perfix = ndt.DetectionTypeCode + "-" + unit.UnitCode + "-" + work.WorkAreaCode + "-PI" + "-";
newBatchTrust.TrustBatchCode = BLL.SQLHelper.RunProcNewId("SpGetNewCode", "dbo.Batch_BatchTrust", "TrustBatchCode", project.ProjectId, perfix);
string trustBatchcode = string.Empty;
if (r["PointState"].ToString() == "1") // 点口
{
string perfix = string.Empty;
perfix = ndt.DetectionTypeCode + "-" + unit.UnitCode + "-" + work.WorkAreaCode + "-PI" + "-";
trustBatchcode = BLL.SQLHelper.RunProcNewId("SpGetNewCode", "dbo.Batch_BatchTrust", "TrustBatchCode", project.ProjectId, perfix);
}
if (r["PointState"].ToString() == "2") // 扩透
{
var exp = BLL.RepairRecordService.GetRepairRecordById(r["RepairRecordId"].ToString());
trustBatchcode = exp.RepairRecordCode.Substring(0, exp.RepairRecordCode.Length - 2) + "EX1";
}
if (r["PointState"].ToString() == "3") // 返修
{
var repair = BLL.RepairRecordService.GetRepairRecordById(r["RepairRecordId"].ToString());
trustBatchcode = repair.RepairRecordCode;
}
if (r["PointState"].ToString() == "4") // 修磨
{
var repair = BLL.RepairRecordService.GetRepairRecordById(r["RepairRecordId"].ToString());
trustBatchcode = repair.RepairRecordCode;
}
if (r["PointState"].ToString() == "5") // 异物
{
var repair = BLL.RepairRecordService.GetRepairRecordById(r["RepairRecordId"].ToString());
trustBatchcode = repair.RepairRecordCode;
}
newBatchTrust.TrustBatchCode = trustBatchcode;
string trustBatchId = SQLHelper.GetNewID(typeof(Model.Batch_BatchTrust));
newBatchTrust.TrustBatchId = trustBatchId;
@@ -275,27 +314,43 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
newBatchTrust.IsWelderFirst = Convert.ToBoolean(r["IsWelderFirst"]);
newBatchTrust.DetectionTypeId = point.DetectionTypeId;
newBatchTrust.PipelineId = point.PipelineId;
newBatchTrust.TrustType= r["PointState"].ToString();
BLL.Batch_BatchTrustService.AddBatchTrust(newBatchTrust); // 新增委托单
// 生成委托明细，并回写点口明细信息
string itemSql = @"SELECT pItem.PointBatchItemId,pItem.PointBatchId,jot.WeldingMethodId,
string itemSql=string.Empty;
// 扩透口，如两个焊接方法或坡口类型不一至也放一个委托单
if (r["PointState"].ToString() == "1")
{
itemSql = @"SELECT pItem.PointBatchItemId,pItem.PointBatchId,jot.WeldingMethodId,
jot.GrooveTypeId,(CASE WHEN pItem.IsWelderFirst=1 THEN 1 ELSE 0 END) AS IsWelderFirst
FROM Batch_PointBatchItem AS pItem
LEFT JOIN Pipeline_WeldJoint AS jot ON jot.WeldJointId=pItem.WeldJointId
WHERE CHARINDEX(PointBatchItemId,@PointBatchItemList)>0
AND PointBatchId=@PointBatchId AND jot.WeldingMethodId=@WeldingMethodId
AND jot.GrooveTypeId=@GrooveTypeId
AND jot.GrooveTypeId=@GrooveTypeId AND pItem.PointState=@PointState
AND (CASE WHEN pItem.IsWelderFirst=1 THEN '1' ELSE '0' END)=@IsWelderFirst";
}
else
{
itemSql = @"SELECT pItem.PointBatchItemId,pItem.PointBatchId,jot.WeldingMethodId,
jot.GrooveTypeId,0 AS IsWelderFirst
FROM Batch_PointBatchItem AS pItem
LEFT JOIN Pipeline_WeldJoint AS jot ON jot.WeldJointId=pItem.WeldJointId
WHERE CHARINDEX(PointBatchItemId,@PointBatchItemList)>0
AND PointBatchId=@PointBatchId AND pItem.PointState=@PointState
AND pItem.RepairRecordId=@RepairRecordId";
}
List<SqlParameter> param = new List<SqlParameter>();
param.Add(new SqlParameter("@PointBatchItemList", PointBatchItemList));
param.Add(new SqlParameter("@PointBatchId", r["PointBatchId"].ToString()));
param.Add(new SqlParameter("@WeldingMethodId", newBatchTrust.WeldingMethodId));
param.Add(new SqlParameter("@GrooveTypeId", newBatchTrust.GrooveTypeId));
param.Add(new SqlParameter("@PointState", r["PointState"].ToString()));
param.Add(new SqlParameter("@IsWelderFirst", r["IsWelderFirst"].ToString()));
param.Add(new SqlParameter("@RepairRecordId", r["RepairRecordId"].ToString()));
SqlParameter[] paramList = param.ToArray();
DataTable dtItem = SQLHelper.GetDataTableRunText(itemSql, paramList);
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx
+1 -1
View File
@@ -242,7 +242,7 @@
<f:RenderField ColumnID="IsPointAudit" DataField="IsPointAudit"
FieldType="String" Hidden="true">
</f:RenderField>
</Columns>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs
+114 -19
View File
@@ -600,8 +600,8 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
CONVERT(INT,dbo.Fun_GetParseInt(WeldJointCode)) AS ConvertJoint,
(CASE WHEN IsWelderFirst=1 THEN '是' ELSE '否' END) AS IsWelderFirst,
(CASE WHEN IsCompletedPoint=1 THEN '已处理' ELSE '待处理' END) CompletedState,
JLAudit,GLGSAudit,QTAudit,IsPointAudit,
(CASE WHEN PointDate IS NOT NULL AND IsBuildTrust=1 THEN '已委托'
JLAudit,GLGSAudit,QTAudit,IsPointAudit,TrustBatchItemId,
(CASE WHEN PointDate IS NOT NULL AND (IsBuildTrust=1 OR TrustBatchItemId IS NOT NULL) THEN '已委托'
ELSE (CASE WHEN PointDate IS NOT NULL THEN '未委托' ELSE '' END) END) AS IsTrust
FROM dbo.View_Batch_PointBatchItem
WHERE PointBatchId=@PointBatchId";
@@ -614,11 +614,11 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
{
if (drpIsTrust.SelectedValue == "1")
{
strSql += " AND PointDate IS NOT NULL AND IsBuildTrust IS NULL";
strSql += " AND PointDate IS NOT NULL AND IsBuildTrust IS NULL AND TrustBatchItemId IS NULL";
}
else
{
strSql += " AND PointDate IS NOT NULL AND IsBuildTrust IS NOT NULL";
strSql += " AND PointDate IS NOT NULL AND (IsBuildTrust IS NOT NULL OR TrustBatchItemId IS NOT NULL)";
}
}
if (drpIsCompletedPoint.SelectedValue != "0")
@@ -682,10 +682,14 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
//bool isPointAudit = Convert.ToBoolean(row["IsPointAudit"]);
string isTrust = row["IsTrust"].ToString();
int isPointAudit = Convert.ToInt32(row["IsPointAudit"].ToString());
if (row["PointState"].ToString() == "返修")
{
string dd = row["IsTrust"].ToString();
}
// 未审核的或已委托的口禁用复选框
if (isPointAudit!=1 || isTrust == "已委托")
{
//e.RowSelectable = false;
e.CellCssClasses[ckbIsPointAudit.ColumnIndex] = "hidethis";
@@ -885,15 +889,61 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
{
foreach (DataRow r in dt.Rows)
{
int detectionRateValue = Convert.ToInt32(r["DetectionRateValue"]);
// 已处理但批段未关闭的焊口
List<PointBatchList> batchNoClose = (from x in Funs.DB.Batch_PointBatchItem
List<PointBatchList> compBatchNoClose = (from x in Funs.DB.Batch_PointBatchItem
join y in Funs.DB.Pipeline_WeldJoint on x.WeldJointId equals y.WeldJointId
where x.PointBatchId == r["PointBatchId"].ToString()
&& y.CoverWelderId == r["CoverWelderId"].ToString()
&& (x.BatchOrder == false || x.BatchOrder == null)
&& x.IsCompletedPoint == true
&& (y.IsCancel == false || y.IsCancel == null)
select new PointBatchList { PointBatchItemId = x.PointBatchItemId, JointAttribute = y.JointAttribute }).ToList();
orderby x.EnterDate
select new PointBatchList { PointBatchItemId = x.PointBatchItemId, JointAttribute = y.JointAttribute, PointState = x.PointState }).ToList();
// 先处理：已处理但批段未关闭的焊口大于批段
if (detectionRateValue != 0)
{
// 批中一段的数量
int dnum = Convert.ToInt32((double)100 / detectionRateValue);
// 已处理但批段未关闭的焊口数量
int compBatchNoCloseNum = compBatchNoClose.Count();
int i = 0;
if (compBatchNoCloseNum > dnum)
{
while (i < compBatchNoCloseNum)
{
if (compBatchNoCloseNum - i >= dnum)
{
var lastBatch = compBatchNoClose.GetRange(i, dnum);
var GlastBatch = lastBatch.Where(x => x.JointAttribute == "固定F").ToList();
// 点口
GetRandomPoint(GlastBatch, lastBatch);
//关闭批段
foreach (var g in lastBatch)
{
//BLL.Batch_PointBatchItemService.UpdateIsCompletedPoint(g.PointBatchItemId, true);
BLL.Batch_PointBatchItemService.UpdatePointBatchOrder(g.PointBatchItemId, true);
}
}
else
{
break;
}
i = i + dnum;
}
}
}
// 已处理但批段未关闭的焊口
List<PointBatchList> batchNoClose = (from x in Funs.DB.Batch_PointBatchItem
join y in Funs.DB.Pipeline_WeldJoint on x.WeldJointId equals y.WeldJointId
where x.PointBatchId == r["PointBatchId"].ToString()
&& y.CoverWelderId == r["CoverWelderId"].ToString()
&& (x.BatchOrder == false || x.BatchOrder == null)
&& x.IsCompletedPoint == true
&& (y.IsCancel == false || y.IsCancel == null)
orderby x.EnterDate
select new PointBatchList { PointBatchItemId = x.PointBatchItemId, JointAttribute = y.JointAttribute, PointState = x.PointState }).ToList();
// 未处理焊口
List<PointBatchList> jotList = (from x in Funs.DB.Batch_PointBatchItem
@@ -903,12 +953,12 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
&& (x.IsCompletedPoint == false || x.IsCompletedPoint == null)
&& (y.IsCancel == false || y.IsCancel == null)
orderby x.EnterDate
select new PointBatchList { PointBatchItemId = x.PointBatchItemId, JointAttribute = y.JointAttribute }).ToList();
select new PointBatchList { PointBatchItemId = x.PointBatchItemId, JointAttribute = y.JointAttribute, PointState=x.PointState }).ToList();
// 未处理固定焊口
List<PointBatchList> GJot = jotList.Where(x => x.JointAttribute == "固定F").ToList();
if (Convert.ToInt32(r["DetectionRateValue"]) != 0)
if (detectionRateValue != 0)
{
// 批中一段的数量
int dnum = Convert.ToInt32((double)100 / (int)r["DetectionRateValue"]);
@@ -922,8 +972,10 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
#region batchNoCloseNum大于0表示批段已处理但批段未关闭的焊口集合里，些批段已点口
if (batchNoCloseNum > 0)
{
// 如批段未关闭的焊口大于段数
if ((batchNoCloseNum + jotListNum) > dnum)
{
// 关闭上一个批段还需要的数量
int closeNum = dnum - batchNoCloseNum;
var bachtclose = jotList.GetRange(0, closeNum);
@@ -1515,12 +1567,35 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
var unit = BLL.Base_UnitService.GetUnit(trust.UnitId);
var ndt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(trust.DetectionTypeId);
var work = BLL.Project_WorkAreaService.GetProject_WorkAreaByWorkAreaId(trust.WorkAreaId);
string trustBatchcode = string.Empty;
string perfix = string.Empty;
//perfix = unit.UnitCode + "-" + ins.InstallationCode + "-GD-" + ndt.DetectionTypeCode + "-";
perfix = ndt.DetectionTypeCode + "-" + unit.UnitCode + "-" + work.WorkAreaCode + "-PI" + "-";
newBatchTrust.TrustBatchCode = BLL.SQLHelper.RunProcNewId("SpGetNewCode", "dbo.Batch_BatchTrust", "TrustBatchCode", project.ProjectId, perfix);
if (trust.PointState == "1")
{
trustBatchcode = BLL.SQLHelper.RunProcNewId("SpGetNewCode", "dbo.Batch_BatchTrust", "TrustBatchCode", project.ProjectId, perfix);
}
if (trust.PointState == "2")
{
var exp = BLL.RepairRecordService.GetRepairRecordById(trust.RepairRecordId);
trustBatchcode = exp.RepairRecordCode.Substring(0, exp.RepairRecordCode.Length - 2) + "EX1";
}
if (trust.PointState == "3")
{
var repair = BLL.RepairRecordService.GetRepairRecordById(trust.RepairRecordId);
trustBatchcode = repair.RepairRecordCode;
}
if (trust.PointState == "4")
{
var repair = BLL.RepairRecordService.GetRepairRecordById(trust.RepairRecordId);
trustBatchcode = repair.RepairRecordCode;
}
if (trust.PointState == "5")
{
var repair = BLL.RepairRecordService.GetRepairRecordById(trust.RepairRecordId);
trustBatchcode = repair.RepairRecordCode;
}
newBatchTrust.TrustBatchCode = trustBatchcode;
string trustBatchId = SQLHelper.GetNewID(typeof(Model.Batch_BatchTrust));
newBatchTrust.TrustBatchId = trustBatchId;
@@ -1537,14 +1612,28 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
BLL.Batch_BatchTrustService.AddBatchTrust(newBatchTrust); // 新增委托单
List<Model.View_GenerateTrustItem_FJ> generateTrustItem = new List<Model.View_GenerateTrustItem_FJ>();
// 生成委托条件对比
var generateTrustItem = from x in db.View_GenerateTrustItem_FJ
where x.ProjectId == trust.ProjectId && x.InstallationId == trust.InstallationId
&& x.WorkAreaId == trust.WorkAreaId && x.UnitId == trust.UnitId
&& x.WeldingMethodId==trust.WeldingMethodId && x.GrooveTypeId==trust.GrooveTypeId
&& x.IsWelderFirst==trust.IsWelderFirst && x.DetectionTypeId == trust.DetectionTypeId
&& x.PipelineId == trust.PipelineId
select x;
if (trust.PointState == "1")
{
generateTrustItem = (from x in db.View_GenerateTrustItem_FJ
where x.ProjectId == trust.ProjectId && x.InstallationId == trust.InstallationId
&& x.WorkAreaId == trust.WorkAreaId && x.UnitId == trust.UnitId
&& x.WeldingMethodId == trust.WeldingMethodId && x.GrooveTypeId == trust.GrooveTypeId
&& x.IsWelderFirst == trust.IsWelderFirst && x.DetectionTypeId == trust.DetectionTypeId
&& x.PipelineId == trust.PipelineId && x.PointState == trust.PointState
select x).ToList();
}
else
{
generateTrustItem = (from x in db.View_GenerateTrustItem_FJ
where x.ProjectId == trust.ProjectId && x.InstallationId == trust.InstallationId
&& x.WorkAreaId == trust.WorkAreaId && x.UnitId == trust.UnitId
&& x.DetectionTypeId == trust.DetectionTypeId && x.PipelineId == trust.PipelineId
&& x.RepairRecordId==trust.RepairRecordId && x.PointState == trust.PointState
select x).ToList();
}
string toPointBatch = string.Empty;
// 生成委托明细，并回写点口明细信息
foreach (var item in generateTrustItem)
@@ -1990,6 +2079,12 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
get;
set;
}
public string PointState
{
get;
set;
}
}
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs
+1 -3
View File
@@ -323,9 +323,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
{
if (this.tvControlItem.SelectedNode != null)
{
string strSql = @"SELECT batchItem.TrustBatchItemId, pipe.PipelineCode,jot.Specification,
(CASE WHEN PointBatchItem.PointState='2' then jot.WeldJointCode+'K'
ELSE jot.WeldJointCode END) AS WeldJointCode,
string strSql = @"SELECT batchItem.TrustBatchItemId, pipe.PipelineCode,jot.Specification,jot.WeldJointCode,
(CASE WHEN CoverWelder.WelderCode IS NOT NULL AND BackingWelder.WelderCode IS NOT NULL
THEN backingWelder.WelderCode + '/' + coverWelder.WelderCode
ELSE (ISNULL(coverWelder.WelderCode,'') + ISNULL(backingWelder.WelderCode,'')) END) AS WelderCode,
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchSelect.aspx
+11 -2
View File
@@ -4,6 +4,12 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>委托单查询</title>
<style>
.f-grid-row-summary .f-grid-cell-inner {
font-weight: bold;
color: red;
}
</style>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
</head>
<body>
@@ -18,12 +24,15 @@
DataIDField="TrustBatchItemId" AllowSorting="true" SortField="TrustBatchCode,PipelineCode,WeldJointCode"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True"
EnableCheckBoxSelect="true">
EnableCheckBoxSelect="true" EnableSummary="true" SummaryPosition="Flow">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpInstallation" runat="server" Label="<%$ Resources:Lan,InstallationCode %>"
LabelAlign="Right" EnableEdit="true" Width="240" LabelWidth="90px" >
LabelAlign="Right" EnableEdit="true" Width="240" LabelWidth="90px" AutoPostBack="true" OnSelectedIndexChanged="drpInstallation_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="drpWorkAreaId" runat="server" Label="<%$ Resources:Lan,ConstructionArea %>"
LabelAlign="Right" Width="280px">
</f:DropDownList>
<f:TextBox ID="txtTrustBatchCode" runat="server" Label="<%$ Resources:Lan,RequestSheetNumber %>"
LabelAlign="Right" Width="280px" LabelWidth="90">
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchSelect.aspx.cs
+36
View File
@@ -11,6 +11,7 @@ using System.Linq;
using System.IO;
using BLL;
using System.Text;
using Newtonsoft.Json.Linq;
namespace FineUIPro.Web.WeldingProcess.TrustManage
{
@@ -28,6 +29,8 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
BLL.Project_InstallationService.InitInstallationDropDownList(this.drpInstallation, true, this.CurrUser.LoginProjectId, Resources.Lan.PleaseSelect);
Funs.FineUIPleaseSelect(this.drpWorkAreaId, Resources.Lan.PleaseSelect);
//BLL.Project_WorkAreaService.InitWorkAreaDropDownList(this.drpWorkAreaId, true, this.CurrUser.LoginProjectId, "", "", string.Empty, Resources.Lan.PleaseSelect);//区域
}
}
@@ -47,6 +50,11 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
strSql += " AND InstallationId = @InstallationId";
listStr.Add(new SqlParameter("@InstallationId", drpInstallation.SelectedValue));
}
if (drpWorkAreaId.SelectedValue != Const._Null)
{
strSql += " AND WorkAreaId = @WorkAreaId";
listStr.Add(new SqlParameter("@WorkAreaId", drpWorkAreaId.SelectedValue));
}
if (!string.IsNullOrEmpty(this.txtTrustBatchCode.Text))
{
strSql += " AND TrustBatchCode LIKE @TrustBatchCode";
@@ -85,6 +93,12 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
var distinctTrustBatchCode = tb.AsEnumerable().GroupBy(row => row.Field<string>("TrustBatchId")).Select(group => group.First());
JObject summary = new JObject();
summary.Add("TrustBatchCode", "合计委托单数："+distinctTrustBatchCode.Count().ToString());
summary.Add("WeldJointCode", tb.Rows.Count.ToString());
Grid1.SummaryData = summary;
}
/// <summary>
@@ -285,5 +299,27 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
}
#region 下拉选择事件
/// <summary>
/// 单位下拉选择事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void drpInstallation_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpWorkAreaId.Items.Clear();
if (this.drpInstallation.SelectedValue != BLL.Const._Null)
{
BLL.Project_WorkAreaService.InitWorkAreaDropDownList(this.drpWorkAreaId, true, this.CurrUser.LoginProjectId, this.drpInstallation.SelectedValue, string.Empty, string.Empty, Resources.Lan.PleaseSelect);
}
else
{
Funs.FineUIPleaseSelect(this.drpWorkAreaId, Resources.Lan.PleaseSelect);
}
this.drpWorkAreaId.SelectedValue = BLL.Const._Null;
}
#endregion
}
}
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchSelect.aspx.designer.cs
Generated
+9
View File
@@ -68,6 +68,15 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
/// </remarks>
protected global::FineUIPro.DropDownList drpInstallation;
/// <summary>
/// drpWorkAreaId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkAreaId;
/// <summary>
/// txtTrustBatchCode 控件。
/// </summary>