diff --git a/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java b/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java index 3460248d..70229cec 100644 --- a/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java +++ b/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java @@ -238,4 +238,6 @@ public interface PartInformationMapper extends BaseMapper void savePartModelHeaders(List modelHeaders); void savePartModelDetails(List modelDetails); + + List queryPart(PartInformationVo data); } diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java index e54c5d8b..3059a98f 100644 --- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java +++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java @@ -2242,10 +2242,6 @@ public class PartInformationServiceImpl extends ServiceImpl queryPart(PartInformationVo data) { - return lambdaQuery() - .eq(PartInformationEntity::getPartNo,data.getPartNo()) - .eq(PartInformationEntity::getSite,data.getSite()) - .eq(PartInformationEntity::getStatus,"Y") - .list(); + return baseMapper.queryPart(data); } } diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml index 005700fb..d337a61f 100644 --- a/src/main/resources/mapper/part/PartInformationMapper.xml +++ b/src/main/resources/mapper/part/PartInformationMapper.xml @@ -1737,4 +1737,17 @@ (#{item.partNo}, #{item.site}, #{item.codeNo}, #{item.subCodeSeqNo,jdbcType=FLOAT}, #{item.subCodeDesc}, #{item.itemNo,jdbcType=FLOAT}, #{item.propertiesItemNo}, #{item.textValue}, #{item.numValue,jdbcType=FLOAT}, #{item.recordType}, #{item.orderId}) + + diff --git a/src/main/resources/mapper/quotation/QuotationDetailMapper.xml b/src/main/resources/mapper/quotation/QuotationDetailMapper.xml index c66f8a43..14f8028f 100644 --- a/src/main/resources/mapper/quotation/QuotationDetailMapper.xml +++ b/src/main/resources/mapper/quotation/QuotationDetailMapper.xml @@ -250,8 +250,8 @@ code_desc, function_type FROM plm_properties_model_header - WHERE function_type = 'IP' - AND code_no = 'I001' + WHERE function_type = 'BJ' + AND code_no = 'BJ001' AND site = #{site} @@ -261,8 +261,8 @@ select concat('BJ',#{quotationDetailId}),ppmd.site,ppmd.code_no,1,ppmh.code_desc,seq_no,properties_item_no,'','',ppmd.function_type from plm_properties_model_detail ppmd left join plm_properties_model_header ppmh on ppmh.function_type = ppmd.function_type and ppmh.code_no = ppmd.code_no and ppmh.site = ppmd.site - WHERE ppmd.function_type = 'IP' - AND ppmd.code_no = 'I001' + WHERE ppmd.function_type = 'BJ' + AND ppmd.code_no = 'BJ001' AND ppmd.site = #{site}