From bbc19702155847206d6003fbdffc677bfac1b720 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Tue, 25 Nov 2025 10:41:27 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=20base=20=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plat/module/base/enums/ErrorCodeConstants.java | 3 +++ .../dao/materialclasses/MaterialClassesMapper.java | 8 ++++++++ .../materialhasclasses/MaterialHasClassesMapper.java | 8 ++++++++ .../MaterialHasPropertiesMapper.java | 9 +++++++++ .../materialproperties/MaterialPropertiesMapper.java | 12 ++++++++++++ 5 files changed, 40 insertions(+) diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/enums/ErrorCodeConstants.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/enums/ErrorCodeConstants.java index 98cc53a5..8bda5275 100644 --- a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/enums/ErrorCodeConstants.java +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/enums/ErrorCodeConstants.java @@ -69,4 +69,7 @@ public interface ErrorCodeConstants { ErrorCode PROCESSING_INFOMATION_OPERATION_NOT_EXISTS = new ErrorCode(1_027_101_006, "工艺工序不存在"); ErrorCode PROCESSING_OPERATION_NOT_EXISTS = new ErrorCode(1_027_101_007, "工序不存在"); ErrorCode PROCESSING_OPERATION_MATERIAL_NOT_EXISTS = new ErrorCode(1_027_101_008, "工艺工序物料不存在"); + + // ========== 主数据同步 ========== + ErrorCode MASTER_DATA_SYNC_DISABLED = new ErrorCode(1_027_900_001, "主数据同步功能已禁用"); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/materialclasses/MaterialClassesMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/materialclasses/MaterialClassesMapper.java index c4861958..aa40fce2 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/materialclasses/MaterialClassesMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/materialclasses/MaterialClassesMapper.java @@ -28,4 +28,12 @@ public interface MaterialClassesMapper extends BaseMapperX { .orderByDesc(MaterialClassesDO::getId)); } + default List selectByCodes(Collection codes) { + if (codes == null || codes.isEmpty()) { + return Collections.emptyList(); + } + return selectList(new LambdaQueryWrapperX() + .in(MaterialClassesDO::getCode, codes)); + } + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/materialhasclasses/MaterialHasClassesMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/materialhasclasses/MaterialHasClassesMapper.java index 8bbde0f2..ba887ced 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/materialhasclasses/MaterialHasClassesMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/materialhasclasses/MaterialHasClassesMapper.java @@ -25,4 +25,12 @@ public interface MaterialHasClassesMapper extends BaseMapperX selectByInfoIds(Collection infoIds) { + if (infoIds == null || infoIds.isEmpty()) { + return Collections.emptyList(); + } + return selectList(new LambdaQueryWrapperX() + .in(MaterialHasClassesDO::getInfomationId, infoIds)); + } + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/materialhasproperties/MaterialHasPropertiesMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/materialhasproperties/MaterialHasPropertiesMapper.java index 824da813..0b91f690 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/materialhasproperties/MaterialHasPropertiesMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/materialhasproperties/MaterialHasPropertiesMapper.java @@ -30,4 +30,13 @@ public interface MaterialHasPropertiesMapper extends BaseMapperX selectByInfoIdsAndPropertyIds(Collection infoIds, Collection propertyIds) { + if (infoIds == null || infoIds.isEmpty() || propertyIds == null || propertyIds.isEmpty()) { + return Collections.emptyList(); + } + return selectList(new LambdaQueryWrapperX() + .in(MaterialHasPropertiesDO::getInfomationId, infoIds) + .in(MaterialHasPropertiesDO::getPropertiesId, propertyIds)); + } + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/materialproperties/MaterialPropertiesMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/materialproperties/MaterialPropertiesMapper.java index 4165ba01..2a8061a6 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/materialproperties/MaterialPropertiesMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/materialproperties/MaterialPropertiesMapper.java @@ -9,6 +9,10 @@ import com.zt.plat.module.base.controller.admin.materialproperties.vo.MaterialPr import com.zt.plat.module.base.dal.dataobject.materialproperties.MaterialPropertiesDO; import org.apache.ibatis.annotations.Mapper; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + /** * 物料属性 Mapper * @@ -47,4 +51,12 @@ public interface MaterialPropertiesMapper extends BaseMapperX selectByCodes(Collection codes) { + if (codes == null || codes.isEmpty()) { + return Collections.emptyList(); + } + return selectList(new LambdaQueryWrapperX() + .in(MaterialPropertiesDO::getCode, codes)); + } + } \ No newline at end of file