lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC

This commit is contained in:
李鹏飞 2023-11-03 15:18:03 +08:00
parent cc801e5336 b0e1999b85
commit 717afaed5a
2 changed files with 112 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
View File

@ -633,35 +633,59 @@ namespace FineUIPro.Web.common
List<double> listdata = new List<double>(); List<double> listdata = new List<double>();
double result = 0; double result = 0;
Model.SGGLDB db = Funs.DB; Model.SGGLDB db = Funs.DB;
//一次检测合格焊口数 var ndtLists = from x in db.HJGL_FL_NdtList where x.ProjectId == ProjectId select x;
int oneCheckJotNum = (from x in db.HJGL_Batch_NDEItem ////一次检测合格焊口数
join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId //int oneCheckJotNum = (from x in db.HJGL_Batch_NDEItem
join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId // join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId
join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID // join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId
where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null // join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID
&& a.ProjectId == ProjectId // where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null
select x.NDEItemID).Count(); // && a.ProjectId == ProjectId
//一次检测返修焊口数 // select x.NDEItemID).Count();
int oneCheckRepairJotNum = (from x in db.HJGL_Batch_NDEItem ////一次检测返修焊口数
join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId //int oneCheckRepairJotNum = (from x in db.HJGL_Batch_NDEItem
join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId // join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId
join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID // join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId
where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null && x.CheckResult == "2" // join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID
&& a.ProjectId == ProjectId // where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null && x.CheckResult == "2"
select x.NDEItemID).Count(); // && a.ProjectId == ProjectId
if (oneCheckJotNum > 0) // select x.NDEItemID).Count();
if (ndtLists.Count() > 0)
{ {
var a = Convert.ToDouble(oneCheckJotNum - oneCheckRepairJotNum); decimal a = 0, b = 0;
var b = Convert.ToDouble(oneCheckJotNum); foreach (var item in ndtLists)
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 0)); {
a += Funs.GetNewDecimalOrZero(item.OneTimeFilmQualifiedAmount);
b += Funs.GetNewDecimalOrZero(item.OneTimeFilmAmount);
}
if (b > 0)
{
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
hjallNumber = b.ToString(); hjallNumber = b.ToString();
hjfinishNumber = a.ToString(); hjfinishNumber = a.ToString();
hjzgl = result.ToString(); hjzgl = result.ToString();
hjDataValue = (100 - result).ToString(); hjDataValue = (100 - result).ToString();
} }
}
else
{
var data = (from x in db.HJGL_FL_Data where x.ProjectId == ProjectId orderby x.CompileDate descending select x).FirstOrDefault();
if(data!=null)
{
decimal a = Funs.GetNewDecimalOrZero(data.OneTimeFilmQualifiedAmount);
decimal b = Funs.GetNewDecimalOrZero(data.OneTimeFilmAmount);
if (b > 0)
{
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
hjallNumber = b.ToString();
hjfinishNumber = a.ToString();
hjzgl = result.ToString();
hjDataValue = (100 - result).ToString();
}
}
}
} }
#endregion #endregion
@ -963,7 +987,8 @@ namespace FineUIPro.Web.common
item.DataTime.ToString().Replace('/', '-').Split(' ')[0] + "</span></div>"; item.DataTime.ToString().Replace('/', '-').Split(' ')[0] + "</span></div>";
} }
} }
else { else
{
returnDbHtml = "<div></div>"; returnDbHtml = "<div></div>";
} }
this.div_dbsxlist.InnerHtml = returnDbHtml; this.div_dbsxlist.InnerHtml = returnDbHtml;

44
SGGL/FineUIPro.Web/common/main_new.aspx.cs
View File

@ -565,31 +565,39 @@ namespace FineUIPro.Web.common
List<double> listdata = new List<double>(); List<double> listdata = new List<double>();
double result = 0; double result = 0;
Model.SGGLDB db = Funs.DB; Model.SGGLDB db = Funs.DB;
//一次检测合格焊口数 var ndtLists = from x in db.HJGL_FL_NdtList select x;
int oneCheckJotNum = (from x in db.HJGL_Batch_NDEItem ////一次检测合格焊口数
join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId //int oneCheckJotNum = (from x in db.HJGL_Batch_NDEItem
join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId // join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId
join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID // join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId
where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null // join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID
select x.NDEItemID).Count(); // where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null
//一次检测返修焊口数 // select x.NDEItemID).Count();
int oneCheckRepairJotNum = (from x in db.HJGL_Batch_NDEItem ////一次检测返修焊口数
join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId //int oneCheckRepairJotNum = (from x in db.HJGL_Batch_NDEItem
join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId // join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId
join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID // join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId
where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null && x.CheckResult == "2" // join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID
select x.NDEItemID).Count(); // where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null && x.CheckResult == "2"
if (oneCheckJotNum > 0) // select x.NDEItemID).Count();
if (ndtLists.Count() > 0)
{ {
var a = Convert.ToDouble(oneCheckJotNum - oneCheckRepairJotNum); decimal a = 0, b = 0;
var b = Convert.ToDouble(oneCheckJotNum); foreach (var item in ndtLists)
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 0)); {
a += Funs.GetNewDecimalOrZero(item.OneTimeFilmQualifiedAmount);
b += Funs.GetNewDecimalOrZero(item.OneTimeFilmAmount);
}
if (b > 0)
{
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
hjallNumber = b.ToString(); hjallNumber = b.ToString();
hjfinishNumber = a.ToString(); hjfinishNumber = a.ToString();
hjzgl = result.ToString(); hjzgl = result.ToString();
hjDataValue = (100 - result).ToString(); hjDataValue = (100 - result).ToString();
} }
}
} }