From f1f79e18bd76df9346f7786c3d10df503a6f3e00 Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Mon, 20 May 2024 17:01:11 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...viceImpl.java => OrderProcessApiImpl.java} | 7 ++- .../dataobject/process/OrderProcessDO.java | 2 +- .../process/OrderProcessServiceImpl.java | 44 +++++++++---------- .../manage/dal/mysql/plate/PlateMapper.java | 14 +++--- .../system/enums/ErrorCodeConstants.java | 2 +- .../api/process/ProcessGroupApiImpl.java | 9 +++- .../dal/mysql/process/ProcessMapper.java | 6 +-- .../process/ProcessGroupServiceImpl.java | 2 +- .../service/process/ProcessServiceImpl.java | 19 ++++---- .../mapper/process/ProcessMapper.xml | 22 +++++----- 10 files changed, 70 insertions(+), 57 deletions(-) rename cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/orderProcess/{OrderProcessServiceImpl.java => OrderProcessApiImpl.java} (70%) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/orderProcess/OrderProcessServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/orderProcess/OrderProcessApiImpl.java similarity index 70% rename from cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/orderProcess/OrderProcessServiceImpl.java rename to cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/orderProcess/OrderProcessApiImpl.java index e4af0c92a..9c7bba307 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/orderProcess/OrderProcessServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/orderProcess/OrderProcessApiImpl.java @@ -4,18 +4,23 @@ package com.cf.imes.module.executor.api.orderProcess; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.module.executor.dal.dataobject.process.OrderProcessDO; import com.cf.imes.module.executor.service.process.OrderProcessService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import static com.cf.imes.framework.common.pojo.CommonResult.success; -public class OrderProcessServiceImpl implements OrderProcessApi{ +@RestController // 提供 RESTful API 接口，给 Feign 调用 +@Validated +public class OrderProcessApiImpl implements OrderProcessApi{ @Resource private OrderProcessService orderProcessService; @Override public CommonResult getOrderProcessByProcessGroupId(Long id) { + System.out.println(" Long id " + id); OrderProcessDO plateDO = orderProcessService.getOrderProcessByProcessGroupId(id); if (plateDO == null) { return success(false); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java index 015bbe559..0fa371564 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java @@ -12,7 +12,7 @@ import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; * * @author 晨丰科技 */ -@TableName("order_process") +@TableName("imes_prod.order_process") @KeySequence("order_process_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java index d9e4b2ff7..458eff829 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java @@ -70,30 +70,30 @@ public class OrderProcessServiceImpl implements OrderProcessService { // 插入 OrderProcessDO orderProcess = BeanUtils.toBean(createReqVO, OrderProcessDO.class).setId((Long) identifierGenerator.nextId(null)); -// -// List processStepDOS = new ArrayList<>(); -// List orderProcessStepItemDOS = new ArrayList<>(); -// // 需要获取工序组的具体信息，以及工序组中工序的信息，然后将工序组中工序的信息插入到生产单工序步骤表中 -// ProcessListReqDTO processListReqDTO = processGroupApi.getProcessGroupDetail(createReqVO.getGroupId()); -// System.err.println(processListReqDTO); -// processListReqDTO.getLists().forEach(processRespDTO -> { -// ProcessStepDO processStepDO = BeanUtils.toBean(processRespDTO, ProcessStepDO.class).setOrderId(createReqVO.getOrderId()) -// .setStatus(false).setProcessinfoId(processRespDTO.getId()).setOrderProcessId(orderProcess.getId()) -// .setId((Long) identifierGenerator.nextId(null));// 计划日期没有填写 -// processStepDOS.add(processStepDO); -// OrderProcessStepItemDO orderProcessStepItemDO = OrderProcessStepItemDO.builder() -// .name(processRespDTO.getName()) -// .processStepId(processRespDTO.getId()) -// .orderProcessId(orderProcess.getId()) -// .status(false) -// .groupName(processListReqDTO.getName()) -// .build();// 查模块id，柜体id，加工组id -// orderProcessStepItemDOS.add(orderProcessStepItemDO); -// }); + + List processStepDOS = new ArrayList<>(); + List orderProcessStepItemDOS = new ArrayList<>(); + // 需要获取工序组的具体信息，以及工序组中工序的信息，然后将工序组中工序的信息插入到生产单工序步骤表中 + ProcessListReqDTO processListReqDTO = processGroupApi.getProcessGroupDetail(createReqVO.getGroupId()); + + processListReqDTO.getLists().forEach(processRespDTO -> { + ProcessStepDO processStepDO = BeanUtils.toBean(processRespDTO, ProcessStepDO.class).setOrderId(createReqVO.getOrderId()) + .setStatus(false).setProcessinfoId(processRespDTO.getId()).setOrderProcessId(orderProcess.getId()) + .setId((Long) identifierGenerator.nextId(null));// 计划日期没有填写 + processStepDOS.add(processStepDO); + OrderProcessStepItemDO orderProcessStepItemDO = OrderProcessStepItemDO.builder() + .name(processRespDTO.getName()) + .processStepId(processRespDTO.getId()) + .orderProcessId(orderProcess.getId()) + .status(false) + .groupName(processListReqDTO.getName()) + .build();// 查模块id，柜体id，加工组id + orderProcessStepItemDOS.add(orderProcessStepItemDO); + }); // 批量插入 orderProcessMapper.insert(orderProcess); -// processStepMapper.insertBatch(processStepDOS); -// processStepItemMapper.insertBatch(orderProcessStepItemDOS); + processStepMapper.insertBatch(processStepDOS); + processStepItemMapper.insertBatch(orderProcessStepItemDOS); // 返回 return orderProcess.getId(); } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java index 6387b5742..d06a7096d 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java @@ -22,19 +22,19 @@ public interface PlateMapper extends BaseMapperX { default PageResult selectPage(PlatePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(PlateDO::getOrganId, reqVO.getOrganId()) .eqIfPresent(PlateDO::getGoodsId, reqVO.getGoodsId()) .likeIfPresent(PlateDO::getGoodsName, reqVO.getGoodsName()) - .eqIfPresent(PlateDO::getMaterial, reqVO.getMaterial()) - .eqIfPresent(PlateDO::getColor, reqVO.getColor()) + .likeIfPresent(PlateDO::getMaterial, reqVO.getMaterial()) + .likeIfPresent(PlateDO::getColor, reqVO.getColor()) .eqIfPresent(PlateDO::getWidth, reqVO.getWidth()) .eqIfPresent(PlateDO::getHeight, reqVO.getHeight()) .eqIfPresent(PlateDO::getThickness, reqVO.getThickness()) - .eqIfPresent(PlateDO::getOrganId, reqVO.getOrganId()) - .eqIfPresent(PlateDO::getBrand, reqVO.getBrand()) - .eqIfPresent(PlateDO::getSpec, reqVO.getSpec()) - .eqIfPresent(PlateDO::getRemark, reqVO.getRemark()) + .likeIfPresent(PlateDO::getBrand, reqVO.getBrand()) + .likeIfPresent(PlateDO::getSpec, reqVO.getSpec()) + .likeIfPresent(PlateDO::getRemark, reqVO.getRemark()) .eqIfPresent(PlateDO::getPrice, reqVO.getPrice()) - .eqIfPresent(PlateDO::getOrganId, reqVO.getOrganId()) + .likeIfPresent(PlateDO::getTexture, reqVO.getTexture()) .betweenIfPresent(PlateDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(PlateDO::getId)); } diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java index 64e4b91fb..d25da5b5e 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java @@ -179,7 +179,7 @@ public interface ErrorCodeConstants { //=========== 工序信息 1-002-028-000 ============ ErrorCode PROCESS_NOT_EXISTS = new ErrorCode(1_002_028_000, "工序不存在"); - ErrorCode PROCESS_IS_ENABLED = new ErrorCode(1_002_028_000, "工序以启用，禁止关闭"); + ErrorCode PROCESS_IS_ENABLED = new ErrorCode(1_002_028_000, "工序已在工序组中启用，禁止关闭"); ErrorCode PROCESS_ID_IS_NULL = new ErrorCode(1_002_028_000, "工序ID填写错误不存在"); ErrorCode PROCESS_STATUS_DISABLE = new ErrorCode(1_002_028_000, "工序状态以已禁用"); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/process/ProcessGroupApiImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/process/ProcessGroupApiImpl.java index d36eeb5ec..5d6a04168 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/process/ProcessGroupApiImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/process/ProcessGroupApiImpl.java @@ -12,6 +12,9 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.cf.imes.module.system.enums.ErrorCodeConstants.PROCESS_GROUP_NOT_EXISTS; @@ -34,13 +37,17 @@ public class ProcessGroupApiImpl implements ProcessGroupApi { @Override public ProcessListReqDTO getProcessGroupDetail(Long groupId) { + ProcessGroupDO processGroupDO = processGroupMapper.selectById(groupId); + if (processGroupDO == null) throw exception(PROCESS_GROUP_NOT_EXISTS); String[] items = processGroupDO.getItems().split(","); - ProcessListReqDTO processListReqDTO = BeanUtils.toBean(processGroupDO, ProcessListReqDTO.class); + List lists = new ArrayList<>(); + ProcessListReqDTO processListReqDTO = BeanUtils.toBean(processGroupDO, ProcessListReqDTO.class).setLists(lists); for (String item : items) { ProcessDO processDO = processMapper.selectById(Long.parseLong(item)); + processListReqDTO.getLists().add(BeanUtils.toBean(processDO, ProcessRespDTO.class)); } return processListReqDTO; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/process/ProcessMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/process/ProcessMapper.java index 786f66c71..96bdb7216 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/process/ProcessMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/process/ProcessMapper.java @@ -33,18 +33,18 @@ public interface ProcessMapper extends BaseMapperX { .eqIfPresent(ProcessDO::getOrganId, reqVO.getOrganId()) .eqIfPresent(ProcessDO::getIsEnabled, reqVO.getIsEnabled()) .betweenIfPresent(ProcessDO::getPrepareTime, reqVO.getPrepareTime()) - .eqIfPresent(ProcessDO::getDescription, reqVO.getDescription()) + .likeIfPresent(ProcessDO::getDescription, reqVO.getDescription()) .betweenIfPresent(ProcessDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(ProcessDO::getId)); } - IPage selectProcessPage(@Param("page") IPage page , @Param("page") ProcessPageReqVO reqVO); + IPage selectProcessPage(@Param("page") IPage page , @Param("vo") ProcessPageReqVO reqVO); ProcessDO selectOneById(@Param("id") Long id, @Param("organId") Long organId); default List selectAll(Long organId) { return selectList(new LambdaQueryWrapperX() - .orderByDesc(ProcessDO::getId) +// .orderByDesc(ProcessDO::getId) .eqIfPresent(ProcessDO::getOrganId, organId) .eqIfPresent(ProcessDO::getIsEnabled, true)); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessGroupServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessGroupServiceImpl.java index 49880a724..6ad8f3ee5 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessGroupServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessGroupServiceImpl.java @@ -83,7 +83,7 @@ public class ProcessGroupServiceImpl implements ProcessGroupService { // 校验存在 validateProcessGroupExists(id); // 判断是否在生产中使用这个加工组，如果使用则不能删除 -// checkProcessGroupUsed(id); + checkProcessGroupUsed(id); // 删除 processGroupMapper.deleteById(id); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java index deb7b15d1..6c1dbee74 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java @@ -24,6 +24,7 @@ import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.module.system.dal.mysql.process.ProcessMapper; import java.util.List; +import java.util.Objects; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -87,7 +88,7 @@ public class ProcessServiceImpl implements ProcessService { public void updateProcess(ProcessUserSaveReqVO updateReqVO) { // 校验存在 validateProcessExists(updateReqVO.getId()); - if (updateReqVO.getIsEnabled()) {//为禁用 + if (!updateReqVO.getIsEnabled()) {//调为禁用 if (isProcessUsed(String.valueOf(updateReqVO.getId()))){ throw exception(PROCESS_IS_ENABLED); } @@ -117,14 +118,14 @@ public class ProcessServiceImpl implements ProcessService { } processMapper.updateById(updateProcess); } + // 判断此工序是否已在工序组中使用 public boolean isProcessUsed(String items) { - System.out.println("processGroupMapper.selectListByItems(items) " + processGroupMapper.selectListByItems(items)); - System.out.println(processGroupMapper.selectListByItems(items) != null); - System.out.println(processGroupMapper.selectListByItems(items).size()); - if (processGroupMapper.selectListByItems(items) != null) - return true; - return false; +// System.out.println("processGroupMapper.selectListByItems(items) " + processGroupMapper.selectListByItems(items)); +// System.out.println(processGroupMapper.selectListByItems(items).size()); + if (processGroupMapper.selectListByItems(items).size() == 0) // 没有使用 + return false; + return true; } @Override @@ -169,13 +170,13 @@ public class ProcessServiceImpl implements ProcessService { @Override public PageResult getProcessPage(ProcessPageReqVO pageReqVO) {//分页加用户 - return processMapper.selectPage(pageReqVO); + return processMapper.selectPage(pageReqVO.setOrganId(OrganContextHolder.getOrganId()).setIsDealer(false)); } @Override public PageResult getProcessPageAll(ProcessPageReqVO pageReqVO) { PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - IPage processRespVOPageResult = processMapper.selectProcessPage(page,BeanUtils.toBean(pageReqVO, ProcessPageReqVO.class)); + IPage processRespVOPageResult = processMapper.selectProcessPage(page,BeanUtils.toBean(pageReqVO, ProcessPageReqVO.class).setOrganId(OrganContextHolder.getOrganId())); return new PageResult(BeanUtils.toBean(processRespVOPageResult.getRecords(), ProcessRespVO.class), processRespVOPageResult.getTotal()); } diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/ProcessMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/ProcessMapper.xml index 00ee78002..e434c3d82 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/ProcessMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/ProcessMapper.xml @@ -24,21 +24,21 @@ p.deleted from process p - p.deleted = 0 - - and p.id in (select process_id from process_user where user_id = #{page.userId}) + p.deleted = 0 and p.organ_id = #{vo.organId} + + and p.id in (select process_id from process_user where user_id = #{vo.userId}) - - and p.name like concat('%', #{page.name}, '%') + + and p.name like concat('%', #{vo.name}, '%') - - and p.is_enabled = #{page.isEnabled} + + and p.is_enabled = #{vo.isEnabled} - - and p.type = #{page.type} + + and p.type = #{vo.type} - - and p.piece_type = #{page.pieceType} + + and p.piece_type = #{vo.pieceType}