0522-001
This commit is contained in:
@@ -16,7 +16,17 @@ namespace FineUIPro.Web.common
|
||||
if (!IsPostBack)
|
||||
{
|
||||
string roleCNs = Request.Params["roleCNs"];
|
||||
string roleCNNames = string.Empty;
|
||||
List<string> cns = Funs.GetStrListByStr(roleCNs, ',');
|
||||
List<string> cnNames = new List<string>();
|
||||
foreach (var cn in cns)
|
||||
{
|
||||
var c = BLL.CNProfessionalService.GetCNProfessional(cn);
|
||||
if (c != null && !cnNames.Contains(c.ProfessionalName))
|
||||
{
|
||||
cnNames.Add(c.ProfessionalName);
|
||||
}
|
||||
}
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
//未遂事故
|
||||
//var wsAccidentList1 = from x in db.Accident_AccidentPersonRecord
|
||||
@@ -66,7 +76,7 @@ namespace FineUIPro.Web.common
|
||||
//材料到货情况
|
||||
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() select x;
|
||||
var contractQuantitySheets = from x in Funs.DB.CLGL_ContractQuantitySheet where x.ProjectId == projectId.ToString() && cnNames.Contains(x.Major) 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>";
|
||||
@@ -92,7 +102,7 @@ namespace FineUIPro.Web.common
|
||||
this.hdContractQuantitySheets.Value = contractQuantitySheetsStr;
|
||||
//材料出库情况
|
||||
string materialRecordsStr = string.Empty;
|
||||
var materialRecords= from x in db.CLGL_PickMaterialRecord where x.ProjectId == projectId.ToString() select x;
|
||||
var materialRecords= from x in db.CLGL_PickMaterialRecord where x.ProjectId == projectId.ToString() && cnNames.Contains(x.Major) select x;
|
||||
if (contractQuantitySheets.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>";
|
||||
@@ -121,38 +131,6 @@ namespace FineUIPro.Web.common
|
||||
}
|
||||
}
|
||||
|
||||
protected string swiper_One1
|
||||
{
|
||||
get
|
||||
{
|
||||
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() 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>";
|
||||
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>";
|
||||
i++;
|
||||
}
|
||||
}
|
||||
return contractQuantitySheetsStr;
|
||||
}
|
||||
}
|
||||
|
||||
#region 赢得值曲线
|
||||
protected string Two
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user