feat(hjgl): 完善焊前检查和防腐检查流程
焊前检查需要同时覆盖下料、组对和防腐检查,并支持移动端查询与保存。 扩展焊前检查模型、服务和页面字段,补充检查结果、不合格原因、整改要求、 附件和防腐检查记录,便于按焊口和材料追溯检查过程。
This commit is contained in:
@@ -947,8 +947,8 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
||||
HJGL_MaterialCodeLib lib2 = GetMaterialLib(row2, libsByMaterialCode, libsByCode);
|
||||
|
||||
DataRow dr = tb.NewRow();
|
||||
dr["PipelineCode"] = joint.PipelineCode;
|
||||
dr["SegmentCode"] = preCode;
|
||||
dr["PipelineCode"] = joint.SingleNumber;
|
||||
dr["SegmentCode"] = joint.FlowingSection;
|
||||
dr["WeldJointNo"] = weldJointNo;
|
||||
dr["MaterialText"] = string.IsNullOrEmpty(joint.Material1Code) ? joint.Material2Code : joint.Material1Code;
|
||||
dr["Spec"] = joint.Specification;
|
||||
@@ -962,9 +962,9 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
||||
dr["WelderCode"] = string.IsNullOrEmpty(joint.WelderCode) ? (string.IsNullOrEmpty(joint.BackingWelderCode) ? joint.CoverWelderCode : joint.BackingWelderCode) : joint.WelderCode;
|
||||
dr["WeldingDate"] = joint.WeldingDate;
|
||||
dr["WeldCheck"] = joint.CheckResult;
|
||||
dr["CheckDate"] = joint.AuditDate == null ? string.Empty : joint.AuditDate.Value.ToString("yyyy-MM-dd");
|
||||
dr["CheckDate"] = DateTime.Parse(joint.WeldingDate).AddDays(1).ToString("yyyy-MM-dd");
|
||||
dr["CleanCheck"] = joint.IsHotProessStr;
|
||||
dr["CleanCheckDate"] = joint.AuditDate2 == null ? string.Empty : joint.AuditDate2.Value.ToString("yyyy-MM-dd");
|
||||
dr["CleanCheckDate"] = DateTime.Parse(joint.WeldingDate).AddDays(1).ToString("yyyy-MM-dd");
|
||||
dr["WeldJointId"] = joint.WeldJointId;
|
||||
dr["Material1Code"] = joint.Material1Code;
|
||||
dr["Material2Code"] = joint.Material2Code;
|
||||
|
||||
Reference in New Issue
Block a user