This commit is contained in:
2025-02-14 16:48:50 +08:00
parent 86b1e8b3da
commit 6d4a7e82a7
51 changed files with 1888 additions and 339 deletions
@@ -341,10 +341,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
where x.JOT_JointNo.Contains("G") && x.BatchId == batchId && x.PointTypeStr == "1"
select x).Count();
oneGTrustCounts = oneGTrustCount.ToString();
if (GjointCount != 0)
{
oneGtrustRate = (oneGTrustCount * 100.0 / oneTrustCount * 1.0).ToString("0.00") + "%";
}
if (jointCount != 0)
{
totalCheckRate = (totalCheckCount * 100.0 / jointCount * 1.0).ToString("0.00") + "%";
@@ -352,6 +349,11 @@ namespace FineUIPro.Web.HJGL.WeldingReport
chFixedJotCounts = chFixedJotCount.ToString();
needCheckCount = Convert.ToInt32(Math.Ceiling(jointCount * Convert.ToDecimal(NDTR_Name.Replace("%", "")) / 100));
needCheckCounts = needCheckCount.ToString();
if (needCheckCount != 0)
{
oneGtrustRate = (oneGTrustCount * 100.0 / needCheckCount * 1.0).ToString("0.00") + "%";
}
totalWeldCount = (from x in Funs.DB.HJGL_BO_BatchDetail
join y in Funs.DB.HJGL_PW_JointInfo
on x.JOT_ID equals y.JOT_ID