|
|
|
@ -120,10 +120,10 @@ |
|
|
|
AND spec like #{query.spec} |
|
|
|
</if> |
|
|
|
<if test="query.startDate != null "> |
|
|
|
AND required_completion_date >= #{query.startDate} |
|
|
|
AND create_date >= #{query.startDate} |
|
|
|
</if> |
|
|
|
<if test="query.endDate != null "> |
|
|
|
AND #{query.endDate} >= required_completion_date |
|
|
|
AND #{query.endDate} >= create_date |
|
|
|
</if> |
|
|
|
</where> |
|
|
|
</select> |
|
|
|
@ -1802,7 +1802,8 @@ |
|
|
|
a.PropertiesItemNo as characteristicCode, |
|
|
|
isnull(a.TextValue, '') as attrValueAlpha, |
|
|
|
ISNULL(CONVERT(VARCHAR(20), a.NumValue, 1), '') as attrValueNumeric, |
|
|
|
case when b.ValueType_DB = 'T' then 'Alpha' when b.ValueType_DB = 'N' then 'Numeric' else '' end as characteristicType |
|
|
|
case when b.ValueType_DB = 'T' then 'Alpha' when b.ValueType_DB = 'N' then 'Numeric' else '' end as characteristicType, |
|
|
|
'' as unitMeas |
|
|
|
FROM PartSubPropertiesValue as a |
|
|
|
left join plm_properties_item as b on a.site = b.site and a.PropertiesItemNo = b.ItemNo and a.RecordType = b.ItemType |
|
|
|
where a.site = #{site} and a.RecordType = #{recordType} and a.PartNo = #{partNo} and a.CodeNo = #{codeNo} |
|
|
|
|