From f1337986b28a2a0b26f35eabc4edb0ddd2d551c6 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期二, 07 十一月 2023 17:25:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java index 4136658..a7bd471 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java @@ -2,13 +2,15 @@ import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO; import com.vci.ubcs.code.dto.CodeOrderSecDTO; -import com.vci.ubcs.code.entity.CodeWupinEntity; -import com.vci.ubcs.code.vo.CodeClstemplateVO; +import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO; import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO; +import com.vci.ubcs.starter.revision.model.BaseModel; +import java.util.Collection; import java.util.List; public interface MdmProductCodeService { + /** * 鐢熸垚缂栫爜--骞朵笖淇濆瓨鏁版嵁-鏂规硶鍔犻攣锛屽洜姝や笉鑳借繑鍥瀊atchCBO * @param classifyFullInfoBO 鍒嗙被鐨勫叏閮ㄤ俊鎭� @@ -17,7 +19,15 @@ * @param secDTOList 鍚勪釜鐮佹鐨勫�� * @param dataCBOList 涓氬姟鏁版嵁 */ - List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClstemplateVO templateVO, - CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<CodeWupinEntity> dataCBOList); + List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO, + CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<BaseModel> dataCBOList) throws Exception; + + /** + * 鍥炴敹鐮佸�� + * @param btmId 涓氬姟鏁版嵁鐨勪笟鍔$被鍨� + * @param businessOidCollection 涓氬姟鏁版嵁鐨勪富閿� + * @return 鏄惁鏇存柊鎴愬姛 + */ + Boolean recycleCode(String btmId, Collection<String> businessOidCollection); } -- Gitblit v1.9.3