diff --git a/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java index 241eec58..aad89d0b 100644 --- a/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java +++ b/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java @@ -498,10 +498,13 @@ public class MasterPartInformationServiceImpl extends ServiceImpl - AND required_completion_date >= #{query.startDate} + AND create_date >= #{query.startDate} - AND #{query.endDate} >= required_completion_date + AND #{query.endDate} >= create_date @@ -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}