Commit c68a794e by 陶然

更改回传费用为结算费用,未结算将无法回传

parent cee33379
......@@ -94,7 +94,7 @@ namespace Njhg.Third.Semir.Entities
var reports = conn.SelectByIds<Report>(thirdDetails.ConvertAll(o => o.ReportKvid));
if (reports.IsNullOrEmpty()) return false;
if (reports.Exists(o => o.Status <= (int)ReportStatusType.ReportIssue)) return false;
if (reports.Exists(o => o.AmountTest + o.Amount > 0 && o.AmountSettlement <= 0)) return false;
var result_info = new ReportResultInfo();
result_info.DOC_NO = third.SerialNumber;
result_info.URL_PDF = new List<UrlPdf>();
......@@ -144,7 +144,7 @@ namespace Njhg.Third.Semir.Entities
#region result_info
result_info.EXT_DOC_NO = report.ReportId;
result_info.CHECK_FEE += report.Amount + report.AmountTest;
result_info.CHECK_FEE += report.AmountSettlement;
result_info.RESULT = 4;
if (report.TestJudgement == "合格") result_info.RESULT = 1;
if (report.TestJudgement == "不合格")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment