|
|
@ -869,12 +869,12 @@ |
|
|
a.ActualDate, |
|
|
a.ActualDate, |
|
|
a.FunctionType, |
|
|
a.FunctionType, |
|
|
a.CreateDate, |
|
|
a.CreateDate, |
|
|
d.operator_name as createBy, |
|
|
|
|
|
|
|
|
dbo.eam_Get_eamAdminName_TPM(a.Site,a.CreateBy) as createBy, |
|
|
a.Remark, |
|
|
a.Remark, |
|
|
a.StartTime, |
|
|
a.StartTime, |
|
|
a.EndTime, |
|
|
a.EndTime, |
|
|
a.WorkTime, |
|
|
a.WorkTime, |
|
|
dbo.eam_Get_eamAdminName(a.Site,a.PlanOperator) as PlanOperatorName, |
|
|
|
|
|
|
|
|
dbo.eam_Get_eamAdminName_TPM(a.Site,a.PlanOperator) as PlanOperatorName, |
|
|
a.checkerName, |
|
|
a.checkerName, |
|
|
dbo.eam_Get_eamAdminName(a.Site, a.ActualOperator) as actualOperatorName, |
|
|
dbo.eam_Get_eamAdminName(a.Site, a.ActualOperator) as actualOperatorName, |
|
|
eo.ObjectDesc as objectDesc, |
|
|
eo.ObjectDesc as objectDesc, |
|
|
@ -1013,12 +1013,12 @@ |
|
|
a.ActualDate, |
|
|
a.ActualDate, |
|
|
a.FunctionType, |
|
|
a.FunctionType, |
|
|
a.CreateDate, |
|
|
a.CreateDate, |
|
|
d.operator_name as createBy, |
|
|
|
|
|
|
|
|
dbo.eam_Get_eamAdminName_TPM(a.Site,a.CreateBy) as createBy, |
|
|
a.Remark, |
|
|
a.Remark, |
|
|
a.StartTime, |
|
|
a.StartTime, |
|
|
a.EndTime, |
|
|
a.EndTime, |
|
|
a.WorkTime, |
|
|
a.WorkTime, |
|
|
dbo.eam_Get_eamAdminName(a.Site,a.PlanOperator) as planOperatorName, |
|
|
|
|
|
|
|
|
dbo.eam_Get_eamAdminName_TPM(a.Site,a.PlanOperator) as planOperatorName, |
|
|
b.DefectID, |
|
|
b.DefectID, |
|
|
c.DefectDesc, |
|
|
c.DefectDesc, |
|
|
e.ObjectDesc as objectDesc, |
|
|
e.ObjectDesc as objectDesc, |
|
|
@ -1645,12 +1645,12 @@ |
|
|
a.deleteFlag, |
|
|
a.deleteFlag, |
|
|
a.CreatedDate, |
|
|
a.CreatedDate, |
|
|
a.CreatedBy, |
|
|
a.CreatedBy, |
|
|
c.operator_name as feedbackBy, |
|
|
|
|
|
|
|
|
dbo.eam_Get_eamAdminName_TPM(a.site,a.CreatedBy) as feedbackBy, |
|
|
a.UpdateDate, |
|
|
a.UpdateDate, |
|
|
a.UpdateBy, |
|
|
a.UpdateBy, |
|
|
a.Version, |
|
|
a.Version, |
|
|
a.DefectDate, |
|
|
a.DefectDate, |
|
|
dbo.eam_Get_eamAdminName(a.Site,a.PlanOperator) as PlanOperatorName, |
|
|
|
|
|
|
|
|
dbo.eam_Get_eamAdminName_TPM(a.Site,a.PlanOperator) as PlanOperatorName, |
|
|
b.defectDesc, |
|
|
b.defectDesc, |
|
|
e.ObjectDesc as ObjectDesc, |
|
|
e.ObjectDesc as ObjectDesc, |
|
|
FinishDate, |
|
|
FinishDate, |
|
|
|