提交代码
This commit is contained in:
parent
79a4b53ee5
commit
726383b62e
|
@ -2240,7 +2240,7 @@ namespace BLL
|
||||||
Model.SGGLDB db = Funs.DB;
|
Model.SGGLDB db = Funs.DB;
|
||||||
var projects = from x in db.Base_Project select x;
|
var projects = from x in db.Base_Project select x;
|
||||||
//获取所有在建项目
|
//获取所有在建项目
|
||||||
var str = APIGetHttpService.Http("http://192.168.30.40:8102/csm/third/getAllProjectsUnderConstruction", "GET");
|
var str = APIGetHttpService.Http("https://4dgd.cwcec.com:443/csm/third/getAllProjectsUnderConstruction", "GET");
|
||||||
if (!string.IsNullOrEmpty(str))
|
if (!string.IsNullOrEmpty(str))
|
||||||
{
|
{
|
||||||
var HJGL_FL_TotalQuantitys = from x in db.HJGL_FL_TotalQuantity select x;
|
var HJGL_FL_TotalQuantitys = from x in db.HJGL_FL_TotalQuantity select x;
|
||||||
|
@ -2287,7 +2287,7 @@ namespace BLL
|
||||||
if (project != null)
|
if (project != null)
|
||||||
{
|
{
|
||||||
//项目管道焊接工程量
|
//项目管道焊接工程量
|
||||||
var str1 = APIGetHttpService.Http("http://192.168.30.40:8102/csm/third/getPipelineWeldingQuantities/" + projectCode, "GET");
|
var str1 = APIGetHttpService.Http("https://4dgd.cwcec.com:443/csm/third/getPipelineWeldingQuantities/" + projectCode, "GET");
|
||||||
if (!string.IsNullOrEmpty(str1))
|
if (!string.IsNullOrEmpty(str1))
|
||||||
{
|
{
|
||||||
JArray arr1 = JArray.Parse(str1);
|
JArray arr1 = JArray.Parse(str1);
|
||||||
|
@ -2306,7 +2306,7 @@ namespace BLL
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//无损检测一次合格率
|
//无损检测一次合格率
|
||||||
var str2 = APIGetHttpService.Http("http://192.168.30.40:8102/csm/third/getNondestructiveTestOnceQualifiedRate/" + projectCode, "GET");
|
var str2 = APIGetHttpService.Http("https://4dgd.cwcec.com:443/csm/third/getNondestructiveTestOnceQualifiedRate/" + projectCode, "GET");
|
||||||
if (!string.IsNullOrEmpty(str2))
|
if (!string.IsNullOrEmpty(str2))
|
||||||
{
|
{
|
||||||
JArray arr1 = JArray.Parse(str2);
|
JArray arr1 = JArray.Parse(str2);
|
||||||
|
@ -2352,7 +2352,7 @@ namespace BLL
|
||||||
DateTime lastday = yesterday.AddDays(-7);
|
DateTime lastday = yesterday.AddDays(-7);
|
||||||
string yesterdayStr = string.Format("{0:yyyy-MM-dd}", yesterday);
|
string yesterdayStr = string.Format("{0:yyyy-MM-dd}", yesterday);
|
||||||
string lastdayStr = string.Format("{0:yyyy-MM-dd}", lastday);
|
string lastdayStr = string.Format("{0:yyyy-MM-dd}", lastday);
|
||||||
var str3 = APIGetHttpService.Http("http://192.168.30.40:8102/csm/third/getWeldingEngineeringList/" + projectCode + "/date/" + yesterdayStr + "/" + lastdayStr + "/" + yesterdayStr, "GET");
|
var str3 = APIGetHttpService.Http("https://4dgd.cwcec.com:443/csm/third/getWeldingEngineeringList/" + projectCode + "/date/" + yesterdayStr + "/" + lastdayStr + "/" + yesterdayStr, "GET");
|
||||||
if (!string.IsNullOrEmpty(str3))
|
if (!string.IsNullOrEmpty(str3))
|
||||||
{
|
{
|
||||||
JArray arr1 = JArray.Parse(str3);
|
JArray arr1 = JArray.Parse(str3);
|
||||||
|
@ -2375,7 +2375,7 @@ namespace BLL
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//项目试压包量
|
//项目试压包量
|
||||||
var str4 = APIGetHttpService.Http("http://192.168.30.40:8102/csm/third/getPressurePackageList/" + projectCode, "GET");
|
var str4 = APIGetHttpService.Http("https://4dgd.cwcec.com:443/csm/third/getPressurePackageList/" + projectCode, "GET");
|
||||||
if (!string.IsNullOrEmpty(str4))
|
if (!string.IsNullOrEmpty(str4))
|
||||||
{
|
{
|
||||||
JArray arr1 = JArray.Parse(str4);
|
JArray arr1 = JArray.Parse(str4);
|
||||||
|
@ -2402,7 +2402,7 @@ namespace BLL
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//项目无损检测量
|
//项目无损检测量
|
||||||
var str5 = APIGetHttpService.Http("http://192.168.30.40:8102/csm/third/getNdtList/" + projectCode, "GET");
|
var str5 = APIGetHttpService.Http("https://4dgd.cwcec.com:443/csm/third/getNdtList/" + projectCode, "GET");
|
||||||
if (!string.IsNullOrEmpty(str5))
|
if (!string.IsNullOrEmpty(str5))
|
||||||
{
|
{
|
||||||
JArray arr1 = JArray.Parse(str5);
|
JArray arr1 = JArray.Parse(str5);
|
||||||
|
@ -2425,7 +2425,7 @@ namespace BLL
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//项目尾项清单量
|
//项目尾项清单量
|
||||||
var str6 = APIGetHttpService.Http("http://192.168.30.40:8102/csm/third/getTailItemList/" + projectCode, "GET");
|
var str6 = APIGetHttpService.Http("https://4dgd.cwcec.com:443/csm/third/getTailItemList/" + projectCode, "GET");
|
||||||
if (!string.IsNullOrEmpty(str6))
|
if (!string.IsNullOrEmpty(str6))
|
||||||
{
|
{
|
||||||
JArray arr1 = JArray.Parse(str6);
|
JArray arr1 = JArray.Parse(str6);
|
||||||
|
|
|
@ -46,7 +46,7 @@ namespace FineUIPro.Web.HJGL.FL
|
||||||
if (project != null && !string.IsNullOrEmpty(project.HJProjectCode))
|
if (project != null && !string.IsNullOrEmpty(project.HJProjectCode))
|
||||||
{
|
{
|
||||||
//项目无损检测量
|
//项目无损检测量
|
||||||
var str5 = APIGetHttpService.Http("http://192.168.30.40:8102/csm/third/getNdtList/" + project.HJProjectCode, "GET");
|
var str5 = APIGetHttpService.Http("https://4dgd.cwcec.com:443/csm/third/getNdtList/" + project.HJProjectCode, "GET");
|
||||||
if (!string.IsNullOrEmpty(str5))
|
if (!string.IsNullOrEmpty(str5))
|
||||||
{
|
{
|
||||||
JArray arr1 = JArray.Parse(str5);
|
JArray arr1 = JArray.Parse(str5);
|
||||||
|
|
|
@ -56,7 +56,7 @@ namespace FineUIPro.Web.HJGL.FL
|
||||||
if (project != null && !string.IsNullOrEmpty(project.HJProjectCode))
|
if (project != null && !string.IsNullOrEmpty(project.HJProjectCode))
|
||||||
{
|
{
|
||||||
//无损检测一次合格率
|
//无损检测一次合格率
|
||||||
var str2 = APIGetHttpService.Http("http://192.168.30.40:8102/csm/third/getNondestructiveTestOnceQualifiedRate/" + project.HJProjectCode, "GET");
|
var str2 = APIGetHttpService.Http("https://4dgd.cwcec.com:443/csm/third/getNondestructiveTestOnceQualifiedRate/" + project.HJProjectCode, "GET");
|
||||||
if (!string.IsNullOrEmpty(str2))
|
if (!string.IsNullOrEmpty(str2))
|
||||||
{
|
{
|
||||||
JArray arr1 = JArray.Parse(str2);
|
JArray arr1 = JArray.Parse(str2);
|
||||||
|
|
|
@ -56,7 +56,7 @@ namespace FineUIPro.Web.HJGL.FL
|
||||||
if (project != null && !string.IsNullOrEmpty(project.HJProjectCode))
|
if (project != null && !string.IsNullOrEmpty(project.HJProjectCode))
|
||||||
{
|
{
|
||||||
//项目试压包量
|
//项目试压包量
|
||||||
var str4 = APIGetHttpService.Http("http://192.168.30.40:8102/csm/third/getPressurePackageList/" + project.HJProjectCode, "GET");
|
var str4 = APIGetHttpService.Http("https://4dgd.cwcec.com:443/csm/third/getPressurePackageList/" + project.HJProjectCode, "GET");
|
||||||
if (!string.IsNullOrEmpty(str4))
|
if (!string.IsNullOrEmpty(str4))
|
||||||
{
|
{
|
||||||
JArray arr1 = JArray.Parse(str4);
|
JArray arr1 = JArray.Parse(str4);
|
||||||
|
|
|
@ -68,7 +68,7 @@ namespace FineUIPro.Web.HJGL.FL
|
||||||
}
|
}
|
||||||
string yesterdayStr = string.Format("{0:yyyy-MM-dd}", yesterday);
|
string yesterdayStr = string.Format("{0:yyyy-MM-dd}", yesterday);
|
||||||
string lastdayStr = string.Format("{0:yyyy-MM-dd}", lastday);
|
string lastdayStr = string.Format("{0:yyyy-MM-dd}", lastday);
|
||||||
var str3 = APIGetHttpService.Http("http://192.168.30.40:8102/csm/third/getWeldingEngineeringList/" + project.HJProjectCode + "/date/" + yesterdayStr + "/" + lastdayStr + "/" + yesterdayStr, "GET");
|
var str3 = APIGetHttpService.Http("https://4dgd.cwcec.com:443/csm/third/getWeldingEngineeringList/" + project.HJProjectCode + "/date/" + yesterdayStr + "/" + lastdayStr + "/" + yesterdayStr, "GET");
|
||||||
if (!string.IsNullOrEmpty(str3))
|
if (!string.IsNullOrEmpty(str3))
|
||||||
{
|
{
|
||||||
JArray arr1 = JArray.Parse(str3);
|
JArray arr1 = JArray.Parse(str3);
|
||||||
|
|
|
@ -56,7 +56,7 @@ namespace FineUIPro.Web.HJGL.FL
|
||||||
if (project != null && !string.IsNullOrEmpty(project.HJProjectCode))
|
if (project != null && !string.IsNullOrEmpty(project.HJProjectCode))
|
||||||
{
|
{
|
||||||
//项目尾项清单量
|
//项目尾项清单量
|
||||||
var str6 = APIGetHttpService.Http("http://192.168.30.40:8102/csm/third/getTailItemList/" + project.HJProjectCode, "GET");
|
var str6 = APIGetHttpService.Http("https://4dgd.cwcec.com:443/csm/third/getTailItemList/" + project.HJProjectCode, "GET");
|
||||||
if (!string.IsNullOrEmpty(str6))
|
if (!string.IsNullOrEmpty(str6))
|
||||||
{
|
{
|
||||||
JArray arr1 = JArray.Parse(str6);
|
JArray arr1 = JArray.Parse(str6);
|
||||||
|
|
|
@ -55,7 +55,7 @@ namespace FineUIPro.Web.HJGL.FL
|
||||||
if (project != null && !string.IsNullOrEmpty(project.HJProjectCode))
|
if (project != null && !string.IsNullOrEmpty(project.HJProjectCode))
|
||||||
{
|
{
|
||||||
//项目管道焊接工程量
|
//项目管道焊接工程量
|
||||||
var str1 = APIGetHttpService.Http("http://192.168.30.40:8102/csm/third/getPipelineWeldingQuantities/" + project.HJProjectCode, "GET");
|
var str1 = APIGetHttpService.Http("https://4dgd.cwcec.com:443/csm/third/getPipelineWeldingQuantities/" + project.HJProjectCode, "GET");
|
||||||
if (!string.IsNullOrEmpty(str1))
|
if (!string.IsNullOrEmpty(str1))
|
||||||
{
|
{
|
||||||
JArray arr1 = JArray.Parse(str1);
|
JArray arr1 = JArray.Parse(str1);
|
||||||
|
|
Loading…
Reference in New Issue