From 9b1a85afb5d1ad273a5ea161444062d695c051b1 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Fri, 15 May 2026 09:03:55 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=A6=85=E9=81=93bug#1517=E3=80=81#1?= =?UTF-8?q?521=E4=BF=AE=E5=A4=8D=EF=BC=9B2=E3=80=81=E6=96=B0=E5=A2=9E=20?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=BB=84=E7=BB=87=E8=87=AA=E5=8A=A8=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E9=BB=98=E8=AE=A4=E6=A0=87=E7=AD=BE=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E8=83=BD=E5=8A=9B=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/enums/label/LabelTemplateType.java | 28 +++--- .../enums/label/LabelTemplateTypeTest.java | 7 +- .../funds/delay/vo/ProductDelayPageReqVO.java | 8 +- .../admin/organ/vo/organ/OrganPageReqVO.java | 26 ++++++ .../system/dal/mysql/organ/OrganMapper.java | 11 ++- .../funds/delay/ProductDelayServiceImpl.java | 2 + .../system/service/lable/LabelService.java | 7 ++ .../service/lable/LabelServiceImpl.java | 40 ++++++++ .../service/organ/OrganServiceImpl.java | 92 ++++++------------- .../resources/mapper/organ/OrganMapper.xml | 73 +++++++++++++++ .../label/LabelTemplateTypeValidatorTest.java | 4 +- 11 files changed, 212 insertions(+), 86 deletions(-) diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/label/LabelTemplateType.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/label/LabelTemplateType.java index fef7ce869..50ae5deb4 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/label/LabelTemplateType.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/label/LabelTemplateType.java @@ -12,26 +12,26 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum LabelTemplateType { - /** - * 板材包裹 - */ - PLATEPACKAGELABEL("platePackageLabel"), +// /** +// * 板材包裹 +// */ +// PLATEPACKAGELABEL("platePackageLabel"), /** * 物料 */ MATERIALLABEL("materialLabel"), - /** - * 机台标签 - */ - MACHINELABEL("machineLabel"), - - /** - * 配件包裹标签 - */ - PARTSPACKAGELABEL("partsPackageLabel"), - +// /** +// * 机台标签 +// */ +// MACHINELABEL("machineLabel"), +// +// /** +// * 配件包裹标签 +// */ +// PARTSPACKAGELABEL("partsPackageLabel"), +// /** * 订单包裹标签 */ diff --git a/cf-module-system/cf-module-system-api/src/test/java/com/cf/imes/module/system/enums/label/LabelTemplateTypeTest.java b/cf-module-system/cf-module-system-api/src/test/java/com/cf/imes/module/system/enums/label/LabelTemplateTypeTest.java index eb675e606..d60bb7cfe 100644 --- a/cf-module-system/cf-module-system-api/src/test/java/com/cf/imes/module/system/enums/label/LabelTemplateTypeTest.java +++ b/cf-module-system/cf-module-system-api/src/test/java/com/cf/imes/module/system/enums/label/LabelTemplateTypeTest.java @@ -13,9 +13,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class LabelTemplateTypeTest { @Test void test() { - assertEquals("platePackageLabel", LabelTemplateType.PLATEPACKAGELABEL.getType()); - assertEquals("machineLabel", LabelTemplateType.MACHINELABEL.getType()); - assertEquals("partsPackageLabel", LabelTemplateType.PARTSPACKAGELABEL.getType()); - assertEquals("orderPackageLabel", LabelTemplateType.ORDERPACKAGELABEL.getType()); + assertEquals("platePackageLabel", LabelTemplateType.ORDERPACKAGELABEL.getType()); + assertEquals("materialLabel", LabelTemplateType.MATERIALLABEL.getType()); + } } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/delay/vo/ProductDelayPageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/delay/vo/ProductDelayPageReqVO.java index 34a70ea3a..bc4f0a0ac 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/delay/vo/ProductDelayPageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/delay/vo/ProductDelayPageReqVO.java @@ -7,8 +7,11 @@ import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDate; +import java.time.LocalDateTime; + +import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** * @author Gqr @@ -31,7 +34,8 @@ public class ProductDelayPageReqVO extends PageParam { private Integer delayDuration; @Schema(description = "操作时间") - private LocalDate[] createTime; + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; @Schema(description = "操作人") @Size(max = 64, message = "{product.delay.page.operator.size}") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganPageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganPageReqVO.java index 9f6104316..fe52a586f 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganPageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganPageReqVO.java @@ -2,6 +2,7 @@ package com.cf.imes.module.system.controller.admin.organ.vo.organ; import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.validation.Mobile; +import com.cf.imes.framework.common.validation.NumberValid; import com.cf.imes.module.system.validation.common.CommonStatus; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -9,6 +10,12 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import jakarta.validation.constraints.Size; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 组织分页 Request VO") @Data @@ -61,4 +68,23 @@ public class OrganPageReqVO extends PageParam { @Size(max = 64, message = "区名称长度不能超过64个字符") private String county; + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + @Schema(description = "组织有效日期") + private LocalDateTime[] expireTime; + + @Schema(description = "备注") + @Length(max = 255, message = "备注长度不能超过255个字符") + private String remark; + + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + @Schema(description = "产品有效日期") + private LocalDateTime[] endTime; + + @Schema(description = "产品名称") + @Size(max = 64, message = "产品名称长度不能超过64个字符") + private String productName; + + @Schema(description = "单价") + @NumberValid(name = "单价") + private Integer price; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java index c85c6d286..2b2103c8c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java @@ -46,6 +46,8 @@ public interface OrganMapper extends BaseMapperX { .eqIfPresent(OrganizationDO::getProvince, reqVO.getProvince()) .eqIfPresent(OrganizationDO::getCity, reqVO.getCity()) .eqIfPresent(OrganizationDO::getCounty, reqVO.getCounty()) + .betweenIfPresent(OrganizationDO::getExpireTime, reqVO.getExpireTime()) + .likeIfPresent(OrganizationDO::getRemark, reqVO.getRemark()) .and(CharSequenceUtil.isNotBlank(reqVO.getName()), wrapper ->{ wrapper.or(Boolean.TRUE).like(OrganizationDO::getName, reqVO.getName()); wrapper.or(CharSequenceUtil.isNotBlank(reqVO.getPyAll())).like(OrganizationDO::getPinyinFull, reqVO.getPyAll()); @@ -150,5 +152,12 @@ public interface OrganMapper extends BaseMapperX { .select(OrganizationDO::getId)); } - + /** + * 带产品条件的组织分页查询 + * + * @param page + * @param pageReqVO + * @return + */ + IPage selectPageWithProductExpire(@Param("page") IPage page, @Param("reqVO") OrganPageReqVO pageReqVO); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/delay/ProductDelayServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/delay/ProductDelayServiceImpl.java index 34b5737bc..8d9fd3738 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/delay/ProductDelayServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/delay/ProductDelayServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.cf.imes.framework.common.exception.ServiceException; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.Assert.AssertUtils; +import com.cf.imes.framework.common.util.date.LocalDateTimeUtils; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.mybatis.core.query.LambdaUpdateWrapperX; @@ -150,6 +151,7 @@ public class ProductDelayServiceImpl implements ProductDelayService { @Override public PageResult getPage(ProductDelayPageReqVO pageReqVO) { + pageReqVO.setCreateTime(LocalDateTimeUtils.generateTimeSection(pageReqVO.getCreateTime())); PageResult productDelayRecordDOPageResult = productDelayRecordMapper.selectPage(pageReqVO); return new PageResult<>(BeanUtils.toBean(productDelayRecordDOPageResult.getList(), ProductDelayRespVO.class), productDelayRecordDOPageResult.getTotal()); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelService.java index 366c8037a..f44c7aa3e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelService.java @@ -59,4 +59,11 @@ public interface LabelService { Map> getGroupList(Long organId); List list(String type); + + /** + * 复制组织初始化标签 + * + * @param organId + */ + void copyInitalLabel(Long organId); } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java index 83c4ef80b..1edaa1c6f 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java @@ -1,6 +1,8 @@ package com.cf.imes.module.system.service.lable; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.cf.imes.framework.common.enums.DeletedCodeEnum; import com.cf.imes.framework.common.enums.UserSettingTypeEnum; import com.cf.imes.framework.common.exception.ServiceException; import com.cf.imes.framework.common.pojo.PageResult; @@ -10,12 +12,15 @@ import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.module.system.controller.admin.label.vo.LabelPageReqVO; import com.cf.imes.module.system.controller.admin.label.vo.LabelRespVO; import com.cf.imes.module.system.controller.admin.label.vo.LabelSaveReqVO; +import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelTemplateDO; import com.cf.imes.module.system.dal.dataobject.lable.LabelDO; import com.cf.imes.module.system.dal.dataobject.machine.MachineDO; import com.cf.imes.module.system.dal.dataobject.setting.PackageConfigDO; import com.cf.imes.module.system.dal.mysql.label.LabelMapper; +import com.cf.imes.module.system.dal.mysql.labeltemplate.LabelTemplateMapper; import com.cf.imes.module.system.dal.mysql.machine.MachineMapper; import com.cf.imes.module.system.dal.mysql.setting.PackageConfigMapper; +import com.cf.imes.module.system.enums.label.LabelTemplateType; import com.fasterxml.jackson.databind.JsonNode; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -46,6 +51,9 @@ public class LabelServiceImpl implements LabelService { @Resource private LabelMapper labelMapper; + @Resource + private LabelTemplateMapper labelTemplateMapper; + @Resource private MachineMapper machineMapper; @@ -168,5 +176,37 @@ public class LabelServiceImpl implements LabelService { .stream().map( m -> m.setTemplate(unzipString(m.getTemplate()))).toList(); } + @Override + public void copyInitalLabel(Long organId) { + List addList = new ArrayList<>(); + LabelTemplateType[] values = LabelTemplateType.values(); + for (LabelTemplateType value : values) { + String labelType = value.getType(); + + // 获取标签类型的默认模板 + LabelTemplateDO labelTemplateDO = labelTemplateMapper.selectOne(new LambdaQueryWrapperX() + .eq(LabelTemplateDO::getType, labelType) + .eq(LabelTemplateDO::getIsDefault, Boolean.TRUE) + .eq(LabelTemplateDO::getDeleted, DeletedCodeEnum.NOT_DELETED.getStatus()) + .last("limit 1") + ); + + // 复制标签内容a + if (ObjectUtil.isNotNull(labelTemplateDO)) { + LabelDO labelDO = LabelDO.builder() + .type(labelType) + .name(labelTemplateDO.getName()) + .remark(labelTemplateDO.getRemark()) + .width(labelTemplateDO.getWidth()) + .height(labelTemplateDO.getHeight()) + .template(labelTemplateDO.getTemplate()) + .build(); + labelDO.setOrganId(organId); + addList.add(labelDO); + } + } + + labelMapper.insertBatch(addList); + } } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java index 786dea176..534336693 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java @@ -7,12 +7,14 @@ import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.dynamic.datasource.annotation.DSTransactional; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.common.exception.ServiceException; import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.collection.CollectionUtils; import com.cf.imes.framework.common.util.date.DateUtils; +import com.cf.imes.framework.common.util.date.LocalDateTimeUtils; import com.cf.imes.framework.common.util.i18n.core.util.I18nUtils; import com.cf.imes.framework.common.util.json.JsonUtils; import com.cf.imes.framework.common.util.object.BeanUtils; @@ -42,7 +44,6 @@ import com.cf.imes.module.system.convert.organ.OrganConvert; import com.cf.imes.module.system.dal.dataobject.dict.DictDataDO; import com.cf.imes.module.system.dal.dataobject.lable.LabelDO; import com.cf.imes.module.system.dal.dataobject.machine.MachineDO; -import com.cf.imes.module.system.dal.dataobject.machine.MachineLimitDO; import com.cf.imes.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; import com.cf.imes.module.system.dal.dataobject.organ.OrganizationDO; import com.cf.imes.module.system.dal.dataobject.permission.MenuDO; @@ -51,7 +52,6 @@ import com.cf.imes.module.system.dal.dataobject.systemconfig.*; import com.cf.imes.module.system.dal.dataobject.tokenconfig.TokenConfigDO; import com.cf.imes.module.system.dal.mysql.dict.DictDataMapper; import com.cf.imes.module.system.dal.mysql.label.LabelMapper; -import com.cf.imes.module.system.dal.mysql.machine.MachineLimitMapper; import com.cf.imes.module.system.dal.mysql.machine.MachineMapper; import com.cf.imes.module.system.dal.mysql.organ.OrganMapper; import com.cf.imes.module.system.dal.mysql.systemconfig.*; @@ -60,6 +60,7 @@ import com.cf.imes.module.system.enums.config.SystemConfigTypeEnum; import com.cf.imes.module.system.enums.permission.RoleCodeEnum; import com.cf.imes.module.system.framework.product.ProductProperties; import com.cf.imes.module.system.service.funds.purchase.PurchaseService; +import com.cf.imes.module.system.service.lable.LabelService; import com.cf.imes.module.system.service.organ.handler.OrganInfoHandler; import com.cf.imes.module.system.service.organ.handler.OrganMenuHandler; import com.cf.imes.module.system.service.permission.MenuService; @@ -80,6 +81,7 @@ import org.springframework.validation.annotation.Validated; import jakarta.annotation.Resource; +import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -125,9 +127,6 @@ public class OrganServiceImpl implements OrganService { @Value("${chenfeng.organ.use-data-code:imes_prod}") private String useDataCode; - @Resource - private MachineLimitMapper machineLimitMapper; - @Resource private TokenConfigMapper tokenConfigMapper; @@ -146,12 +145,6 @@ public class OrganServiceImpl implements OrganService { @Resource private SystemConfigFilterMapper systemConfigFilterMapper; - @Resource - private SystemConfigProcessMapper systemConfigProcessMapper; - - @Resource - private SystemConfigDataMapper systemConfigDataMapper; - @Resource private SystemConfigSchemeMapper systemConfigSchemeMapper; @@ -164,6 +157,9 @@ public class OrganServiceImpl implements OrganService { @Resource private LabelMapper labelMapper; + @Resource + private LabelService labelService; + @Resource private PurchaseService purchaseService; @@ -243,14 +239,10 @@ public class OrganServiceImpl implements OrganService { // 2、修改组织的管理员 organMapper.updateById(new OrganizationDO().setId(tenant.getId()).setContactUserId(userId)); - // 往组织机台授权表新增信息 - MachineLimitDO machineLimitDO = MachineLimitDO.builder() - .organId(organId) - .build(); - machineLimitMapper.insert(machineLimitDO); - // 复制系统配置里的相关配置 copySystemConfig(organId); + // 复制默认标签 + labelService.copyInitalLabel(organId); // 创建产品购买记录 List productPurchaseReqVOS = createReqVO.getProductPurchaseReqVOS(); @@ -486,6 +478,7 @@ public class OrganServiceImpl implements OrganService { @Override public PageResult getOrganPage(OrganPageReqVO pageReqVO) { + pageReqVO.setExpireTime(LocalDateTimeUtils.generateTimeSection(pageReqVO.getExpireTime())); if(CharSequenceUtil.isNotBlank(pageReqVO.getName())) { pageReqVO.setPyFirstChar(PinYinUtils.convertFirstChar(pageReqVO.getName())); pageReqVO.setPyAll(PinYinUtils.convertToPinyin(pageReqVO.getName()).replace(" ", "")); @@ -494,7 +487,20 @@ public class OrganServiceImpl implements OrganService { pageReqVO.setPyFirstChar(null); pageReqVO.setPyAll(null); } - return organMapper.selectPage(pageReqVO); + + LocalDateTime[] endTime = pageReqVO.getEndTime(); + if ((ObjectUtil.isNotNull(endTime) && endTime.length == 2) || + ObjectUtil.isNotNull(pageReqVO.getProductName()) || + ObjectUtil.isNotNull(pageReqVO.getPrice())) { + // 产品相关条件非空的情况下走带特定方法 + pageReqVO.setEndTime(LocalDateTimeUtils.generateTimeSection(endTime)); + + PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + IPage organizationDOIPage = organMapper.selectPageWithProductExpire(page, pageReqVO); + return new PageResult<>(organizationDOIPage.getRecords(), organizationDOIPage.getTotal()); + } else { + return organMapper.selectPage(pageReqVO); + } } @Override @@ -588,7 +594,11 @@ public class OrganServiceImpl implements OrganService { return new PageResult<>(BeanUtils.toBean(organPage.getRecords(), OrganRespVO.class), organPage.getTotal()); } - // 系统配置数据复制 + /** + * 复制系统配置 + * + * @param organId + */ private void copySystemConfig(Long organId) { List dictDataDOS = dictDataMapper.selectListByStatusAndDictType(CommonStatusEnum.ENABLE.getStatus(), "copy_data_organ"); @@ -628,7 +638,7 @@ public class OrganServiceImpl implements OrganService { } - // 板件分线 + // 板件筛选 List systemConfigFilterDOS = systemConfigFilterMapper.selectList(new LambdaQueryWrapperX() .eq(SystemConfigFilterDO::getOrganId, copyOrganId) .eq(SystemConfigFilterDO::getDeleted, false) @@ -647,48 +657,6 @@ public class OrganServiceImpl implements OrganService { } - // 加工分线 - List systemConfigProcessDOS = systemConfigProcessMapper.selectList(new LambdaQueryWrapperX() - .eq(SystemConfigProcessDO::getOrganId, copyOrganId) - .eq(SystemConfigProcessDO::getDeleted, false) - .eq(SystemConfigProcessDO::getType, SystemConfigTypeEnum.PROCESSING_SCREENING.getType())); - if(CollUtil.isNotEmpty(systemConfigProcessDOS)){ - systemConfigProcessDOS.forEach(f->{ - f.setId(null); - f.setOrganId(organId); - f.setCreateTime(null); - f.setCreator(null); - f.setUpdateTime(null); - f.setUpdater(null); - }); - - systemConfigProcessMapper.insertBatch(systemConfigProcessDOS); - } - - - // 数据处理 - List systemConfigDataDOS = systemConfigDataMapper.selectList(new LambdaQueryWrapperX() - .eq(SystemConfigDataDO::getOrganId, copyOrganId) - .eq(SystemConfigDataDO::getDeleted, false) - .eq(SystemConfigDataDO::getType, SystemConfigTypeEnum.DATA_PROCESSING.getType())); - if(CollUtil.isNotEmpty(systemConfigDataDOS)){ - systemConfigDataDOS.forEach(f->{ - f.setId(null); - f.setOrganId(organId); - f.setCreateTime(null); - f.setCreator(null); - f.setUpdateTime(null); - f.setUpdater(null); - }); - - systemConfigDataMapper.insertBatch(systemConfigDataDOS); - } - - - // 加工方案,(需要复制的组织ID，需要添加数据的组织ID) - copyConfigSchemeMachineAndLabel(copyOrganId,organId); - - // 封边条对应 List systemConfigSealedgeDOS = systemConfigSealedgeMapper.selectList(new LambdaQueryWrapperX() .eq(SystemConfigSealedgeDO::getOrganId, copyOrganId) diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml index 850c4db02..fdb7a4be5 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml @@ -90,4 +90,77 @@ + + \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/validation/label/LabelTemplateTypeValidatorTest.java b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/validation/label/LabelTemplateTypeValidatorTest.java index 8eb1bf32c..bee7a1c8f 100644 --- a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/validation/label/LabelTemplateTypeValidatorTest.java +++ b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/validation/label/LabelTemplateTypeValidatorTest.java @@ -20,10 +20,8 @@ class LabelTemplateTypeValidatorTest extends BaseMockitoUnitTest { @Test void testValid() { LabelTemplateTypeValidator validator = new LabelTemplateTypeValidator(); - assertTrue(validator.isValid(LabelTemplateType.PLATEPACKAGELABEL.getType(), constraintValidatorContext)); - assertTrue(validator.isValid(LabelTemplateType.MACHINELABEL.getType(), constraintValidatorContext)); - assertTrue(validator.isValid(LabelTemplateType.PARTSPACKAGELABEL.getType(), constraintValidatorContext)); assertTrue(validator.isValid(LabelTemplateType.ORDERPACKAGELABEL.getType(), constraintValidatorContext)); + assertTrue(validator.isValid(LabelTemplateType.MATERIALLABEL.getType(), constraintValidatorContext)); assertTrue(validator.isValid("", constraintValidatorContext)); assertFalse(validator.isValid("100", constraintValidatorContext)); }