diff --git a/src/main/java/com/spring/modules/code/mapper/CodeDrawingMapper.java b/src/main/java/com/spring/modules/code/mapper/CodeDrawingMapper.java index fc563e7d..ae01d384 100644 --- a/src/main/java/com/spring/modules/code/mapper/CodeDrawingMapper.java +++ b/src/main/java/com/spring/modules/code/mapper/CodeDrawingMapper.java @@ -6,6 +6,7 @@ import com.spring.modules.code.entity.CodeDrawingDetail; import com.spring.modules.code.vo.CodeDrawingVo; import com.spring.modules.part.entity.MasterPartInformationEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,4 +17,6 @@ public interface CodeDrawingMapper extends BaseMapper { MasterPartInformationEntity queryErpPart(CodeDrawing codeDrawing); List queryCodeDrawingList(CodeDrawingVo codeDrawing); + + int countGeneratedDrawingNo(@Param("site") String site, @Param("normalizedDrawingNo") String normalizedDrawingNo); } 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 7ee330c6..d36e197d 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 @@ -35,6 +35,7 @@ import com.spring.modules.change.entity.TechnicalSpecificationData; import com.spring.modules.change.mapper.ChangeManagementMapper; import com.spring.modules.change.vo.ChangeRequestDetailVo; import com.spring.modules.change.vo.ChangeRequestVo; +import com.spring.modules.code.mapper.CodeDrawingMapper; import com.spring.modules.customer.entity.CustomerGroupInformationEntity; import com.spring.modules.oss.dao.SysOssDao; import com.spring.modules.oss.entity.SysOssEntity; @@ -117,6 +118,9 @@ public class PartInformationServiceImpl extends ServiceImpl() .eq("site", site) @@ -1356,6 +1361,28 @@ public class PartInformationServiceImpl extends ServiceImpl 1) { + char first = Character.toUpperCase(text.charAt(0)); + if (first == 'F' || first == 'R') { + return text.substring(1); + } + } + return text; + } + private String normalizePartAndDrawingText(String text) { if (text == null) { return ""; diff --git a/src/main/resources/mapper/code/CodeDrawingMapper.xml b/src/main/resources/mapper/code/CodeDrawingMapper.xml index 8873b256..84bc411d 100644 --- a/src/main/resources/mapper/code/CodeDrawingMapper.xml +++ b/src/main/resources/mapper/code/CodeDrawingMapper.xml @@ -74,4 +74,16 @@ + +