材料管理修改
This commit is contained in:
@@ -112,19 +112,18 @@ namespace FineUIPro.Web.CLGL
|
||||
var tb = BLL.TwArrivalStatisticsService.GetMatMatchByOutPlanMasterId(inOutPlanMasterId);
|
||||
Grid3.DataSource = tb;
|
||||
Grid3.DataBind();
|
||||
//if (tb!= null && tb.Count > 0)
|
||||
//{
|
||||
// string Rate = Math.Round((decimal)tb.Average(item => item.MatchRate) * 100, 2).ToString() + "%";
|
||||
|
||||
if (tb!= null && tb.Count > 0)
|
||||
{
|
||||
string Rate = Math.Round((decimal)tb.Average(item => item.MatchRate) * 100, 2).ToString() + "%";
|
||||
// JObject summary = new JObject();
|
||||
// //summary.Add("Major", "全部合计");
|
||||
// summary.Add("MatchRateString", Rate);
|
||||
|
||||
JObject summary = new JObject();
|
||||
//summary.Add("Major", "全部合计");
|
||||
summary.Add("MatchRateString", Rate);
|
||||
// Grid3.SummaryData = summary;
|
||||
//}
|
||||
|
||||
Grid3.SummaryData = summary;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
@@ -480,16 +479,17 @@ namespace FineUIPro.Web.CLGL
|
||||
}
|
||||
string planId = Grid1.SelectedRowID;
|
||||
var planMaster = BLL.TwInOutplanmasterService.GetById(planId);
|
||||
if (planMaster.State != (int)TwConst.State.待提交 || planMaster.TypeInt != (int)TwConst.TypeInt.散件出库)
|
||||
{
|
||||
Alert.ShowInTop("请选择有效的计划!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
else
|
||||
if (planMaster.State == (int)TwConst.State.待提交 &&( planMaster.TypeInt == (int)TwConst.TypeInt.散件出库 || planMaster.TypeInt == (int)TwConst.TypeInt.其他出库))
|
||||
{
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OutPlanMasterEdit.aspx?UnitWorkId={0}&Id={1} ", tvControlItem.SelectedNodeID, planId, "新增 - ")));
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Alert.ShowInTop("请选择有效的计划!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
protected void btnPassMaster_OnClick(object sender, EventArgs e)
|
||||
|
||||
Reference in New Issue
Block a user