0914-修改材料接口、焊接管理及三四级看板
This commit is contained in:
@@ -73,77 +73,86 @@ namespace FineUIPro.Web.common
|
||||
//签证
|
||||
var siteVisas = from x in db.Comprehensive_SiteVisaManagement where x.ProjectId == this.CurrUser.LoginProjectId && cns.Contains(x.CNProfessionalId) select x;
|
||||
this.divQZ.InnerHtml = siteVisas.Count().ToString();
|
||||
//材料到货情况
|
||||
//管道材料汇总表
|
||||
string contractQuantitySheetsStr = string.Empty;
|
||||
long projectId = BLL.ProjectService.GetCLProjectCodeByProjectId(this.CurrUser.LoginProjectId);
|
||||
var contractQuantitySheets = from x in Funs.DB.CLGL_ContractQuantitySheet where x.ProjectId == projectId.ToString() && cnNames.Contains(x.Major) select x;
|
||||
var contractQuantitySheets = from x in Funs.DB.CLGL_PipelineMaterialSumList where x.ProjectId == projectId.ToString() && x.Type == "M" select x;
|
||||
if (contractQuantitySheets.Count() > 0)
|
||||
{
|
||||
contractQuantitySheetsStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>材料用途</div><div class='item jd-title'>合同号</div><div class='item jd-title'>专业</div><div class='item jd-title'>材料编码</div><div class='item jd-title'>位号</div><div class='item jd-title'>采购量</div><div class='item jd-title'>装置号</div><div class='item jd-title'>主项号</div><div class='item jd-title'>企业中文名称</div><div class='item jd-title'>备注</div></div>";
|
||||
contractQuantitySheetsStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>材料类别</div><div class='item jd-title'>设计量</div><div class='item jd-title'>预制量</div><div class='item jd-title'>采购量</div><div class='item jd-title'>采购量百分比</div><div class='item jd-title'>已到货</div><div class='item jd-title'>已到货百分比</div><div class='item jd-title'>已领料</div><div class='item jd-title'>已领料百分比</div><div class='item jd-title'>采购量MTO</div><div class='item jd-title'>采购量百分比MTO</div></div>";
|
||||
int i = 1;
|
||||
foreach (var item in contractQuantitySheets)
|
||||
{
|
||||
contractQuantitySheetsStr += "<div class='jd-item'><div class='item'>"
|
||||
+ i + "</div><div class='item'>"
|
||||
+ item.MaterialUse + "</div><div class='item'>"
|
||||
+ item.ContractCode + "</div><div class='item'>"
|
||||
+ item.Major + "</div><div class='item'>"
|
||||
+ item.MaterialCode + "</div><div class='item'>"
|
||||
+ item.TagNo + "</div><div class='item'>"
|
||||
+ item.BuyQuantity + "</div><div class='item'>"
|
||||
+ item.DeviceCode + "</div><div class='item'>"
|
||||
+ item.MainItemCode + "</div><div class='item'>"
|
||||
+ item.UnitName + "</div><div class='item'>"
|
||||
+ item.Remark + "</div></div>";
|
||||
+ item.C1 + "</div><div class='item'>"
|
||||
+ item.C2 + "</div><div class='item'>"
|
||||
+ item.C3 + "</div><div class='item'>"
|
||||
+ item.C4 + "</div><div class='item'>"
|
||||
+ item.C5 + "</div><div class='item'>"
|
||||
+ item.C6 + "</div><div class='item'>"
|
||||
+ item.C7 + "</div><div class='item'>"
|
||||
+ item.C8 + "</div><div class='item'>"
|
||||
+ item.C9 + "</div><div class='item'>"
|
||||
+ item.C10 + "</div><div class='item'>"
|
||||
+ item.C11 + "</div></div>";
|
||||
i++;
|
||||
}
|
||||
}
|
||||
this.divGZL.InnerHtml = contractQuantitySheetsStr;
|
||||
this.hdContractQuantitySheets.Value = contractQuantitySheetsStr;
|
||||
//材料出库情况
|
||||
string materialRecordsStr = string.Empty;
|
||||
var materialRecords = from x in db.CLGL_PickMaterialRecord where x.ProjectId == projectId.ToString() && cnNames.Contains(x.Major) select x;
|
||||
if (materialRecords.Count() > 0)
|
||||
{
|
||||
materialRecordsStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>领料单号</div><div class='item jd-title'>领料时间</div><div class='item jd-title'>领料单位</div><div class='item jd-title'>领料截止时间</div><div class='item jd-title'>专业</div><div class='item jd-title'>材料编码</div><div class='item jd-title'>位号</div><div class='item jd-title'>申领量</div><div class='item jd-title'>批准量</div><div class='item jd-title'>实发量</div><div class='item jd-title'>装置号</div><div class='item jd-title'>主项号</div><div class='item jd-title'>发料备注</div></div>";
|
||||
int i = 1;
|
||||
foreach (var item in materialRecords)
|
||||
{
|
||||
materialRecordsStr += "<div class='jd-item'><div class='item'>"
|
||||
+ i + "</div><div class='item'>"
|
||||
+ item.PickCode + "</div><div class='item'>"
|
||||
+ (item.PickDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.PickDate.Value) : "") + "</div><div class='item'>"
|
||||
+ item.PickUnit + "</div><div class='item'>"
|
||||
+ (item.PickLimitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.PickLimitDate.Value) : "") + "</div><div class='item'>"
|
||||
+ item.Major + "</div><div class='item'>"
|
||||
+ item.MaterialCode + "</div><div class='item'>"
|
||||
+ item.TagNo + "</div><div class='item'>"
|
||||
+ item.ClaimQuantity + "</div><div class='item'>"
|
||||
+ item.ApproveQuantity + "</div><div class='item'>"
|
||||
+ item.ActualQuantity + "</div><div class='item'>"
|
||||
+ item.DeviceCode + "</div><div class='item'>"
|
||||
+ item.MainItemCode + "</div><div class='item'>"
|
||||
+ item.Remark + "</div></div>";
|
||||
i++;
|
||||
}
|
||||
}
|
||||
this.hdMaterialRecords.Value = materialRecordsStr;
|
||||
////材料出库情况
|
||||
//string materialRecordsStr = string.Empty;
|
||||
//var materialRecords = from x in db.CLGL_PickMaterialRecord where x.ProjectId == projectId.ToString() && cnNames.Contains(x.Major) select x;
|
||||
//if (materialRecords.Count() > 0)
|
||||
//{
|
||||
// materialRecordsStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>领料单号</div><div class='item jd-title'>领料时间</div><div class='item jd-title'>领料单位</div><div class='item jd-title'>领料截止时间</div><div class='item jd-title'>专业</div><div class='item jd-title'>材料编码</div><div class='item jd-title'>位号</div><div class='item jd-title'>申领量</div><div class='item jd-title'>批准量</div><div class='item jd-title'>实发量</div><div class='item jd-title'>装置号</div><div class='item jd-title'>主项号</div><div class='item jd-title'>发料备注</div></div>";
|
||||
// int i = 1;
|
||||
// foreach (var item in materialRecords)
|
||||
// {
|
||||
// materialRecordsStr += "<div class='jd-item'><div class='item'>"
|
||||
// + i + "</div><div class='item'>"
|
||||
// + item.PickCode + "</div><div class='item'>"
|
||||
// + (item.PickDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.PickDate.Value) : "") + "</div><div class='item'>"
|
||||
// + item.PickUnit + "</div><div class='item'>"
|
||||
// + (item.PickLimitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.PickLimitDate.Value) : "") + "</div><div class='item'>"
|
||||
// + item.Major + "</div><div class='item'>"
|
||||
// + item.MaterialCode + "</div><div class='item'>"
|
||||
// + item.TagNo + "</div><div class='item'>"
|
||||
// + item.ClaimQuantity + "</div><div class='item'>"
|
||||
// + item.ApproveQuantity + "</div><div class='item'>"
|
||||
// + item.ActualQuantity + "</div><div class='item'>"
|
||||
// + item.DeviceCode + "</div><div class='item'>"
|
||||
// + item.MainItemCode + "</div><div class='item'>"
|
||||
// + item.Remark + "</div></div>";
|
||||
// i++;
|
||||
// }
|
||||
//}
|
||||
//this.hdMaterialRecords.Value = materialRecordsStr;
|
||||
//项目管道焊接工程量
|
||||
string totalQuantityStr = string.Empty;
|
||||
var totalQuantitys = from x in db.HJGL_FL_TotalQuantity where x.ProjectId == this.CurrUser.LoginProjectId orderby x.DeviceName, x.DeviceCode select x;
|
||||
if (totalQuantitys.Count() > 0)
|
||||
{
|
||||
totalQuantityStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>装置名称</div><div class='item jd-title'>单元号</div><div class='item jd-title'>施工单位</div><div class='item jd-title'>焊接总量</div><div class='item jd-title'>已完成总量</div></div>";
|
||||
totalQuantityStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>装置名称</div><div class='item jd-title'>单元号</div><div class='item jd-title'>施工单位</div><div class='item jd-title'>焊接总量</div><div class='item jd-title'>已完成总量</div><div class='item jd-title'>完成比例</div></div>";
|
||||
int i = 1;
|
||||
foreach (var item in totalQuantitys)
|
||||
{
|
||||
string rate = "0%";
|
||||
decimal totalWeldQuantity = Convert.ToDecimal(!string.IsNullOrEmpty(item.TotalWeldQuantity) ? item.TotalWeldQuantity : "0");
|
||||
decimal totalCompleted = Convert.ToDecimal(!string.IsNullOrEmpty(item.TotalCompleted) ? item.TotalCompleted : "0");
|
||||
if (totalWeldQuantity > 0 && totalCompleted > 0)
|
||||
{
|
||||
rate = Convert.ToDecimal(Math.Round(totalCompleted * 100 / totalWeldQuantity, 2)).ToString() + "%";
|
||||
}
|
||||
totalQuantityStr += "<div class='jd-item'><div class='item'>"
|
||||
+ i + "</div><div class='item'>"
|
||||
+ item.DeviceName + "</div><div class='item'>"
|
||||
+ item.DeviceCode + "</div><div class='item'>"
|
||||
+ item.Unit + "</div><div class='item'>"
|
||||
+ item.TotalWeldQuantity + "</div><div class='item'>"
|
||||
+ item.TotalCompleted + "</div></div>";
|
||||
+ item.TotalCompleted + "</div><div class='item'>"
|
||||
+ rate + "</div></div>";
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user