From a0734b6f1f192352c600cad3ca59804041391b99 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Fri, 27 Sep 2024 15:42:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=BE=97=E6=9C=BA=E5=8F=B0=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=93=81=E7=89=8C=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=8E=92?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E6=89=93=E5=8C=85=E8=A1=A5=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/OrderItemTypeEnum.java | 27 ++ .../enums/GlobalErrorCodeConstants.java | 7 +- .../core/handler/GlobalExceptionHandler.java | 10 +- .../executor/dal/dataobject/plan/PlanDO.java | 10 +- .../dal/dataobject/rawgoods/RawGoodsDO.java | 6 +- .../executor/dal/mysql/goods/GoodsMapper.java | 24 +- .../dal/mysql/orderItem/OrderItemMapper.java | 17 +- .../executor/dal/mysql/plan/PlanMapper.java | 5 +- .../executor/dal/mysql/plate/PlateMapper.java | 37 -- .../optimizeplan/OptimizePlanServiceImpl.java | 125 +++---- .../service/order/OrderServiceImpl.java | 6 +- .../executor/service/plan/PlanService.java | 1 - .../service/plan/PlanServiceImpl.java | 42 +-- .../resources/mapper/goods/GoodsMapper.xml | 72 +--- .../resources/mapper/order/OrderMapper.xml | 4 +- .../mapper/orderItem/OrderItemMapper.xml | 12 - .../main/resources/mapper/plan/PlanMapper.xml | 114 +----- .../resources/mapper/plate/PlateMapper.xml | 353 +----------------- .../dal/dataobject/process/OrderDO.java | 4 + .../dal/dataobject/query/OrderItemDO.java | 5 +- .../remainplaten/RemainPlateDO.java | 3 +- .../dal/mysql/pack/OrderPackageMapper.java | 11 - .../mysql/pack/OrderPrepackagedMapper.java | 9 - .../dal/mysql/process/OrdersMapper.java | 5 +- .../manage/service/pack/PackServiceImpl.java | 2 + .../dal/mysql/pack/OrderPackageMapper.xml | 63 ---- .../manage/dal/mysql/process/OrdersMapper.xml | 43 +-- .../datasource/vo/DataSourceFiledReqVO.java | 3 +- .../admin/machine/vo/CuttingRespVO.java | 36 +- .../service/machine/MachineServiceImpl.java | 13 +- .../src/main/resources/application.yaml | 1 + 31 files changed, 198 insertions(+), 872 deletions(-) create mode 100644 cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/OrderItemTypeEnum.java diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/OrderItemTypeEnum.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/OrderItemTypeEnum.java new file mode 100644 index 000000000..b686913b1 --- /dev/null +++ b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/OrderItemTypeEnum.java @@ -0,0 +1,27 @@ +package com.cf.imes.framework.common.enums; + + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum OrderItemTypeEnum { + + PLATE(1, "板材"), + PARTS(2, "五金/配件"), + OTHER(3, "其他"), + QUOTATIONACCESSORIES(4, "报价配件"); + + private final Integer type; + private String description; + + public boolean equals(Integer status) { + return this.type .equals(status) ; + } + + public boolean equals(OrderItemTypeEnum enableStatusEnum) { + return enableStatusEnum != null && enableStatusEnum.type .equals(this.getType()) ; + } + +} diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/exception/enums/GlobalErrorCodeConstants.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/exception/enums/GlobalErrorCodeConstants.java index 7d3b717ca..4edb02b89 100644 --- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/exception/enums/GlobalErrorCodeConstants.java +++ b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/exception/enums/GlobalErrorCodeConstants.java @@ -33,8 +33,11 @@ public interface GlobalErrorCodeConstants { ErrorCode INTERNAL_SERVER_ERROR = new ErrorCode(500, "系统异常，请联系客服处理"); ErrorCode NOT_IMPLEMENTED = new ErrorCode(501, "功能未实现/未开启"); ErrorCode ERROR_CONFIGURATION = new ErrorCode(502, "错误的配置项"); - ErrorCode ES_ERROR_UPDATE = new ErrorCode(503, "ES文档更新失败"); - ErrorCode ES_ERROR_DELETE = new ErrorCode(504, "ES文档删除失败"); + + // ES文档更新失败 + ErrorCode ES_ERROR_UPDATE = new ErrorCode(503, "数据异常，请勿点击过快，请稍等再试"); + // ES文档删除失败 + ErrorCode ES_ERROR_DELETE = new ErrorCode(504, "数据异常，请勿点击过快，请稍等再试"); ErrorCode DATA_EXCEPTION_ERROR = new ErrorCode(505, "数据异常，请联系客服处理"); // ========== 自定义错误段 ========== diff --git a/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java b/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java index 70601c32c..d21c0b7fa 100644 --- a/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java +++ b/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java @@ -236,9 +236,13 @@ public class GlobalExceptionHandler { return tableNotExistsResult; } -// if(ex instanceof NullPointerException){ -// return CommonResult.error(DATA_EXCEPTION_ERROR.getCode(), DATA_EXCEPTION_ERROR.getMsg()); -// } + if(ex instanceof NullPointerException){ + // 处理异常 + log.error("[defaultExceptionHandler]", ex); + // 插入异常日志 + this.createExceptionLog(req, ex); + return CommonResult.error(DATA_EXCEPTION_ERROR.getCode(), DATA_EXCEPTION_ERROR.getMsg()); + } // 情况二：部分特殊的库的处理 if (Objects.equals("io.github.resilience4j.ratelimiter.RequestNotPermitted", ex.getClass().getName())) { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plan/PlanDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plan/PlanDO.java index 3d68915a7..b2616549d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plan/PlanDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plan/PlanDO.java @@ -1,14 +1,10 @@ package com.cf.imes.module.executor.dal.dataobject.plan; -import com.cf.imes.framework.organ.core.db.OrganBaseDO; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; + +import java.time.LocalDateTime; /** * 生产单开料排单 DO diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/rawgoods/RawGoodsDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/rawgoods/RawGoodsDO.java index c59a9fcfb..ae9dc3b99 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/rawgoods/RawGoodsDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/rawgoods/RawGoodsDO.java @@ -1,12 +1,8 @@ package com.cf.imes.module.executor.dal.dataobject.rawgoods; -import com.cf.imes.framework.organ.core.db.OrganBaseDO; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; /** * 生产单设计商品表 order_raw_goods_{N} DO diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java index 1f0cc2d2e..16968bbb7 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java @@ -75,7 +75,7 @@ public interface GoodsMapper extends BaseMapperX { } // 删板材，批量 - void updateDeletedById(@Param("ids") List ids, @Param("deleted") Integer deleted, @Param("organId") Long organId); + void updateDeletedById(@Param("orderId") Long orderId,@Param("ids") List ids, @Param("deleted") Integer deleted, @Param("organId") Long organId); void deletedById(@Param("ids") List ids, @Param("organId") Long organId); @@ -108,15 +108,6 @@ public interface GoodsMapper extends BaseMapperX { - default List selectListByGoodsIdList(List goodsIds,List orderIds, Long organId) { - return selectList(new LambdaQueryWrapperX() - .eq(GoodsDO::getOrganId, organId) - .eq(GoodsDO::getDeleted, false) - .in(GoodsDO::getGoodsId, goodsIds) - .in(GoodsDO::getOrderId, orderIds)); - - } - List selectPlanGoodsDataSource(@Param("filed") String filed,@Param("planId") Long planId ,@Param("organId") Long organId); @@ -133,9 +124,6 @@ public interface GoodsMapper extends BaseMapperX { - IPage selectOrderGoodsList(@Param("page") IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); - - List selectOrderGoodsPlateList(@Param("planIds") List planIds, @Param("organId") Long organId); @@ -160,7 +148,6 @@ public interface GoodsMapper extends BaseMapperX { } - List selectGoodsListByGoodsId(@Param(Constants.WRAPPER) Wrapper wrapper); IPage selectPlanGoodsListByPlanId(@Param("page") IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); @@ -168,23 +155,23 @@ public interface GoodsMapper extends BaseMapperX { List selectGoodsAndRemainPlate(@Param("ids") List ids,@Param("organId") Long organId); - IPage selectNoPlanOrderList(@Param("page") IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); - - default int deletePlanGoods(List ids, Long organId) { + default int deletePlanGoods(List orderIds,List ids, Long organId) { return update(new LambdaUpdateWrapper() .set(GoodsDO::getPlanId, 0) .eq(GoodsDO::getOrganId, organId) + .in(GoodsDO::getOrderId, orderIds) .in(GoodsDO::getPlanId, ids)); } - default List selectPlanGoodsListByPlanIdList(List planIds, Long organId) { + default List selectPlanGoodsListByPlanIdList(List orderIds,List planIds, Long organId) { return selectList(new LambdaQueryWrapperX() .eq(GoodsDO::getOrganId, organId) .eq(GoodsDO::getDeleted, false) + .inIfPresent(GoodsDO::getOrderId,orderIds) .in(GoodsDO::getPlanId,planIds) .select(GoodsDO::getGoodsId,GoodsDO::getId,GoodsDO::getOrderId)); @@ -196,7 +183,6 @@ public interface GoodsMapper extends BaseMapperX { List selectNoPlanRoomBody(@Param("orderIds") List orderIds, @Param("organId") Long organId); - IPage selectOrderPlate(@Param("page") IPage page,@Param("organId") Long organId); List selectPlanOrderList(@Param("orderId") Long orderId,@Param("roomIds") Set roomIds, @Param("bodyId") Long bodyId,@Param("organId") Long organId); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java index 5228abcd9..b81f00137 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java @@ -5,7 +5,6 @@ import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPlatesDetailRespVO; import com.cf.imes.module.executor.controller.admin.orderParts.vo.OrderPartsRespVO; -import com.cf.imes.module.executor.controller.admin.plan.vo.OrderRespVOCopy; import com.cf.imes.module.executor.controller.admin.plate.vo.PlateDetailReqVO; import com.cf.imes.module.executor.controller.admin.plate.vo.PlateDetailRespVO; import com.cf.imes.module.executor.controller.admin.plate.vo.PlateRespVO; @@ -79,17 +78,6 @@ public interface OrderItemMapper extends BaseMapperX { - default List selectPlateIdList(List plateIds, Long organId) { - return selectList(new LambdaQueryWrapperX() - .eq(OrderItemDO::getOrganId,organId) - .inIfPresent(OrderItemDO::getPlateId, plateIds) - .select(OrderItemDO::getBodyId,OrderItemDO::getRoomId,OrderItemDO::getGroupId)); - - } - - - - default List selectPartsList(List partIds,List orderIds, Long organId) { return selectList(new LambdaQueryWrapperX() @@ -100,12 +88,11 @@ public interface OrderItemMapper extends BaseMapperX { } - IPage selectTestNum(@Param("page") IPage page,@Param("organId") Long organId); - - default List selectPackId(List bodyIds, Long organId) { + default List selectPackId(Long orderId,List bodyIds, Long organId) { return selectList(new LambdaQueryWrapperX() .eq(OrderItemDO::getOrganId,organId) + .eq(OrderItemDO::getOrderId,orderId) .inIfPresent(OrderItemDO::getBodyId,bodyIds) .select(OrderItemDO::getPackageId)); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java index d512fb682..8f6c755fa 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java @@ -74,9 +74,6 @@ public interface PlanMapper extends BaseMapperX { List selectPlateListByPlanId(@Param("planId") Long planId, @Param("organId") Long organId); - OptimizeParamRespVO getOptimizePlanParam(Long planId); - - PlanDO selectPlanByOrderIds(@Param("ids") List ids); @@ -116,6 +113,8 @@ public interface PlanMapper extends BaseMapperX { List selectPlanStatus(@Param("planIds") List planIds,@Param("organId") Long organId); + void updatePlanStatus(@Param("planId") Long planId,@Param("status") Integer status,@Param("organId") Long organId); + // List seleTestSQL(@Param("sql") String sql); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java index ce04622e3..ebc53ac3e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java @@ -8,8 +8,6 @@ import com.cf.imes.framework.common.enums.OrderPlateTypeEnum; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.executor.controller.admin.plan.bo.GoodsNum; -import com.cf.imes.module.executor.controller.admin.plan.bo.OrderIds; import com.cf.imes.module.executor.controller.admin.plan.saveOptimize.PrintOrderPackReqVO; import com.cf.imes.module.executor.controller.admin.plan.vo.*; import com.cf.imes.module.executor.controller.admin.plate.vo.PlateGoodsIdVO; @@ -75,11 +73,7 @@ public interface PlateMapper extends BaseMapperX { } // IPage selectPlatePage(@Param("page") IPage page, @Param("orderId")Long organId, @Param("goodsId") String goodsId); - List selectPlatePage( @Param("orderId") Long orderId,@Param("organId") Long organId/*, @Param("goodsId") String goodsId*/); - IPage selectPlateByPlanId(@Param("page") IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); - - List selectPlateList(Long planId); IPage selectProductList(@Param("page") IPage page , @Param("orderId")Long orderId, @Param("roomId")Long roomId , @Param("bodyId")Long bodyId,@Param("organId") Long organId); @@ -92,9 +86,6 @@ public interface PlateMapper extends BaseMapperX { List selectPlateDetialList(@Param("orderId") Long orderId,@Param("organId") Long organId); - List selectPlateDetialListByIds(@Param("orderIds") List orderIds,@Param("organId") Long organId); - - List selectPlateGoodsList(@Param("orderId") Long orderId, @Param("organId") Long organId, @Param("deleted") Integer deleted); // 明细 List selectPlateGoodsListSummary(@Param("orderId") Long orderId, @Param("organId") Long organId, @Param("deleted") Integer deleted); // 汇总 @@ -131,15 +122,9 @@ public interface PlateMapper extends BaseMapperX { List selectGoodsPage( @Param(Constants.WRAPPER) Wrapper wrapper); - IPage selectGoodsList(@Param("page") IPage page,@Param("goodsIds") List goodsIds,@Param("organId") Long organId); - - - List selectOrderIds(@Param("orderIds") List orderIds,@Param("organId") Long organId); - void deletedById(@Param("plateIds") List plateIds, @Param("organId") Long organId); - List selectGoodsNum(@Param("orderIds") List orderIds,@Param("organId") Long organId); default List selectPlateNum(Long orderId, Long organId) { return selectList(new LambdaQueryWrapperX() @@ -173,18 +158,6 @@ public interface PlateMapper extends BaseMapperX { - default List selectGoodsPlateList(List goodIds, Long organId) { - return selectList(new LambdaQueryWrapperX() - .eq(PlateDO::getOrganId,organId) - .inIfPresent(PlateDO::getGoodsId, goodIds)); - - - } - - - List selectPlateListByGoodIds(@Param("goodIds") List goodIds,@Param("organId") Long organId); - - // List selectPlateArea(@Param("orderIdsList") List orderIdsList,@Param("organId") Long organId); @@ -227,16 +200,6 @@ public interface PlateMapper extends BaseMapperX { - default List selectPlateIds(OrderPageReqVOCopy pageReqVO, Long organId) { - return selectList(new LambdaQueryWrapperX() - .eq(PlateDO::getOrganId,organId) - .eq(PlateDO::getDeleted,false) - .eqIfPresent(PlateDO::getIsSpecialShaped,pageReqVO.getSpecialShaped()) - .eqIfPresent(PlateDO::getIsDoor,pageReqVO.getIsDoor()) - .select(PlateDO::getGoodsId)); - - } - List selectNoPlanPlateList(@Param(Constants.WRAPPER) Wrapper queryWrapperX2); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java index 13346b00f..fea5a5677 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java @@ -8,14 +8,12 @@ import co.elastic.clients.elasticsearch.ElasticsearchClient; import co.elastic.clients.elasticsearch._types.FieldValue; import co.elastic.clients.elasticsearch.core.*; import co.elastic.clients.elasticsearch.core.search.Hit; -import com.alibaba.fastjson.JSON; import com.cf.imes.framework.common.enums.OrderStatusEnum; import com.cf.imes.framework.common.enums.PlanStatusEnum; import com.cf.imes.framework.common.exception.ServiceException; import com.cf.imes.framework.common.util.Assert.AssertUtils; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.framework.es.core.service.ESDocumentService; -import com.cf.imes.framework.security.core.LoginUser; import com.cf.imes.module.executor.controller.admin.orderParts.vo.OrderPartsRemark; import com.cf.imes.module.executor.controller.admin.plan.bo.OrderSource; import com.cf.imes.module.executor.controller.admin.plan.bo.ProcessGroupList; @@ -30,7 +28,6 @@ import com.cf.imes.module.executor.dal.dataobject.order.OrderDO; import com.cf.imes.module.executor.dal.dataobject.ordermodel.OrderModelDO; import com.cf.imes.module.executor.dal.dataobject.plan.PlanDO; import com.cf.imes.module.executor.dal.dataobject.plate.PlateDO; -import com.cf.imes.module.executor.dal.dataobject.processStep.ProcessStepDO; import com.cf.imes.module.executor.dal.dataobject.remainplaten.RemainPlateDO; import com.cf.imes.module.executor.dal.mysql.goods.GoodsMapper; import com.cf.imes.module.executor.dal.mysql.order.OrderMapper; @@ -48,7 +45,6 @@ import com.cf.imes.module.infra.api.file.FileApi; import com.cf.imes.module.system.api.dataSource.DataSourceApi; import com.cf.imes.module.system.api.machine.MachineApi; import com.cf.imes.module.system.api.process.ProcessApi; -import com.cf.imes.module.system.api.process.dto.ProcessDTO; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -61,10 +57,10 @@ import java.io.IOException; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; +import java.util.stream.Stream; import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants.*; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; import static com.cf.imes.module.executor.enums.ErrorCodeConstants.ORDER_NOT_EXISTS; import static com.cf.imes.module.executor.enums.ErrorCodeConstants.PLAN_NOT_EXISTS; @@ -221,16 +217,18 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { long cutedBoardNumber = cutedBoardInfo.getCutedBoardNumber() == null ? 0 : cutedBoardInfo.getCutedBoardNumber(); - cutedBoardNumber += goodsNo.size(); - - // 获取原排单的已开料的大板编号 List cutedBoardList = cutedBoardInfo.getCutedBoardList() == null ? new ArrayList<>() : cutedBoardInfo.getCutedBoardList(); + goodsNo.addAll(cutedBoardList); // 将新开料的大板编号添加到已开料的大板编号中 - cutedBoardList.addAll(goodsNo); + cutedBoardList.addAll(Stream.concat( + cutedBoardList.stream().filter(str -> !goodsNo.contains(str)), + goodsNo.stream().filter(str -> !cutedBoardList.contains(str))) + .toList()); + cutedBoardNumber = cutedBoardList.size(); // 将需要更新更新的数据更新到原数据中 cutedBoardInfo.setCutedBoardNumber(cutedBoardNumber); @@ -325,16 +323,16 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { if(cutedBoardInfo.getCutedBoardNumber() == 0){ - planDO.setStatus(PlanStatusEnum.NOCUTTING.getStatus()); - planDO.setProduceTime(null); - planMapper.updateById(planDO); +// planDO.setStatus(PlanStatusEnum.NOCUTTING.getStatus()); +// planDO.setProduceTime(null); + planMapper.updatePlanStatus(planId,PlanStatusEnum.NOCUTTING.getStatus(),getUserOrganId()); } if(planDO.getStatus().equals(PlanStatusEnum.OPENED.getStatus()) && cutedBoardInfo.getCutedBoardNumber() > 0 && cutedBoardInfo.getCutedBoardNumber() < optimizeBoardModelDO.getBoardCount() ){ - planDO.setStatus(PlanStatusEnum.OPENING.getStatus()); - planDO.setProduceTime(null); - planMapper.updateById(planDO); +// planDO.setStatus(PlanStatusEnum.OPENING.getStatus()); +// planDO.setProduceTime(null); + planMapper.updatePlanStatus(planId,PlanStatusEnum.OPENING.getStatus(),getUserOrganId()); } } @@ -350,46 +348,48 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { @Override @Transactional(rollbackFor = Exception.class) public Boolean endCutting(Long planId) { - PlanDO planDO = planMapper.selectById(planId); - if (Objects.isNull(planDO)) { - throw exception(PLAN_NOT_EXISTS); - } - planMapper.updateById(PlanDO.builder() - .id(planId) - .status(PlanStatusEnum.OPENED.getStatus()) - .produceTime(LocalDateTime.now()) - .build()); - - LoginUser loginUser = getLoginUser(); - List userProcess = processApi.getUserProcess(loginUser.getId()); - - if(!userProcess.isEmpty()) { - - List processStepIds = new ArrayList<>(); - - List orderIds = JSON.parseArray(planDO.getOrderNos()).toJavaList(Long.class); - - List processStepDOS = processStepMapper.selectOrderList(orderIds, getUserOrganId()); - - - for (ProcessDTO process : userProcess) { - processStepIds.addAll(processStepDOS.stream().filter(f -> Objects.equals(f.getProcessinfoId(), process.getId())) - .map(ProcessStepDO::getId).toList()); - } - - - if(!processStepIds.isEmpty()) { - - List processStepSalaryIds = calculateSalary(processStepIds); - - // 修改生产明细表和步骤表的工序状态 - processStepMapper.updateStatus(processStepSalaryIds, loginUser.getNickname()); - - processStepItemMapper.updateStatus(processStepIds); - - } - - } + // 目前结束开料已去掉，所以这些代码先注释，后面如果加再修改逻辑 +// +// PlanDO planDO = planMapper.selectById(planId); +// if (Objects.isNull(planDO)) { +// throw exception(PLAN_NOT_EXISTS); +// } +// planMapper.updateById(PlanDO.builder() +// .id(planId) +// .status(PlanStatusEnum.OPENED.getStatus()) +// .produceTime(LocalDateTime.now()) +// .build()); +// +// LoginUser loginUser = getLoginUser(); +// List userProcess = processApi.getUserProcess(loginUser.getId()); +// +// if(!userProcess.isEmpty()) { +// +// List processStepIds = new ArrayList<>(); +// +// List orderIds = JSON.parseArray(planDO.getOrderNos()).toJavaList(Long.class); +// +// List processStepDOS = processStepMapper.selectOrderList(orderIds, getUserOrganId()); +// +// +// for (ProcessDTO process : userProcess) { +// processStepIds.addAll(processStepDOS.stream().filter(f -> Objects.equals(f.getProcessinfoId(), process.getId())) +// .map(ProcessStepDO::getId).toList()); +// } +// +// +// if(!processStepIds.isEmpty()) { +// +// List processStepSalaryIds = calculateSalary(processStepIds); +// +// // 修改生产明细表和步骤表的工序状态 +// processStepMapper.updateStatus(processStepSalaryIds, loginUser.getNickname()); +// +// processStepItemMapper.updateStatus(processStepIds); +// +// } +// +// } return Boolean.TRUE; @@ -504,6 +504,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { List printOrderPartsRespVOS = orderPartsMapper.selectPartList(Collections.singletonList(orderId), getUserOrganId()); + // 查询生产单对应的配件的ES信息 + List orderPartsRemarks = buildOrderPartsByOrderId(Collections.singletonList(orderId), ORDER_PARTS_REMARK_MODEL, printOrderPartsRespVOS.size()); + + // 查询生产单对应的包裹信息 List printOrderPackReqVOS = plateMapper.selectOrderPackList(orderId,getUserOrganId()); @@ -515,14 +519,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { .forEach(f->f.setPackNum(printOrderPackReqVOS.stream().filter(e -> e.getOrderId().equals(orderId)).map(PrintOrderPackReqVO::getPackId).toList().size())); -// orderSource.setOrderList(Collections.singletonList(orderDO)); -// orderSource.setPlateList(plateDOS); -// orderSource.setGoodsList(goodsDOS); -// orderSource.setPlateModels(orderModelDOS); -// orderSource.setOptimizeBoardModelDOS(optimizeBoardModelDOS); -// orderSource.setOrderPartsRespVOS(printOrderPartsRespVOS); -// orderSource.setOrderPackReqVOS(printOrderPackReqVOS); - return OrderSource.builder() .orderList(Collections.singletonList(orderDO)) .goodsList(goodsDOS) @@ -530,6 +526,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { .plateModels(orderModelDOS) .optimizeBoardModelDOS(optimizeBoardModelDOS) .orderPartsRespVOS(printOrderPartsRespVOS) + .orderPartsRemarks(orderPartsRemarks) .orderPackReqVOS(printOrderPackReqVOS) .build(); @@ -712,7 +709,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { // 保存优化后的大板数据 batchSaveBoardModel(req.getOptimizeBoardModelDOS()); - List goodsDOS = goodsMapper.selectPlanGoodsListByPlanIdList(planIds, getUserOrganId()); + List goodsDOS = goodsMapper.selectPlanGoodsListByPlanIdList(null,planIds, getUserOrganId()); List ids = goodsDOS.stream().map(GoodsDO::getId).distinct().toList(); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index 5b408d798..ac1463554 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -288,7 +288,7 @@ public class OrderServiceImpl implements OrderService { plateMapper.updateDeletedById(plateIds, status, getUserOrganId(), orderId);// 删小板 // 删除包裹,只需删除，无需还原 - List packIds = orderItemMapper.selectPackId(bodyIds, getUserOrganId()).stream().map(OrderItemDO::getPackageId).distinct().toList(); + List packIds = orderItemMapper.selectPackId(orderId,bodyIds, getUserOrganId()).stream().map(OrderItemDO::getPackageId).distinct().toList(); orderPackageMapper.updatePackList(orderId, packIds, getUserOrganId()); @@ -321,14 +321,14 @@ public class OrderServiceImpl implements OrderService { if (goodsIdDeleted.size() > 0) { - goodsMapper.updateDeletedById(goodsIdDeleted, status, getUserOrganId()); + goodsMapper.updateDeletedById(orderId,goodsIdDeleted, status, getUserOrganId()); } if (!planIds.isEmpty()) { // 判断删除的柜体对应的板材是否和排单板材一样 - List goodsDOS = goodsMapper.selectPlanGoodsListByPlanIdList(planIds, getUserOrganId()); + List goodsDOS = goodsMapper.selectPlanGoodsListByPlanIdList(null,planIds, getUserOrganId()); // 一样，同时删除排单的信息 if (goodsDOS.isEmpty()) { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java index 671ce92ec..bb8dbdbe0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java @@ -61,7 +61,6 @@ public interface PlanService { PageResult getOrderGoodsPage(OrderPageReqVOCopy pageReqVO); - List getNotPlanPlateListPage(PlateReqPageVO pageVO); Boolean addPlate(AddPlateReq req); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java index 8c965b94f..04866b571 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java @@ -151,7 +151,7 @@ public class PlanServiceImpl implements PlanService { orderIdList.addAll(orderIds); - // 创建计划 + // 创建排单 PlanDO plan = BeanUtils.toBean(createReqVO, PlanDO.class); plan.setId(identifierGenerator.nextId(plan).longValue()); plan.setSort(0L); @@ -191,7 +191,7 @@ public class PlanServiceImpl implements PlanService { public void updatePlan(PlanSaveReqVO updateReqVO) { // 校验排单是否存在，是否开料 - validatePlanExists(updateReqVO.getId()); + Long machineId = validatePlanExists(updateReqVO.getId()); // 更新 PlanDO plan = BeanUtils.toBean(updateReqVO, PlanDO.class); @@ -243,6 +243,12 @@ public class PlanServiceImpl implements PlanService { } + if(!machineId.equals(plan.getMachineId())){ + + deleteByPlanId(Collections.singletonList(plan.getId()),ORDER_REMAIN_PLATE_MODEL); + + } + planMapper.updateById(plan); @@ -322,7 +328,7 @@ public class PlanServiceImpl implements PlanService { List orderIds = new ArrayList<>(); for (PlanDO planDO : planDOS) { - orderIds.addAll(JSON.parseArray(planDO.getOrderNos()).toJavaList(Long.class)); + orderIds.addAll(JSON.parseArray(planDO.getOrderNos()).toJavaList(Long.class).stream().distinct().toList()); } @@ -337,7 +343,7 @@ public class PlanServiceImpl implements PlanService { if(!boardModelDOS.isEmpty()) { - List goodsIdList = goodsMapper.selectPlanGoodsListByPlanIdList(ids, getUserOrganId()).stream().map(GoodsDO::getId).toList(); + List goodsIdList = goodsMapper.selectPlanGoodsListByPlanIdList(orderIds,ids, getUserOrganId()).stream().map(GoodsDO::getId).toList(); if(!goodsIdList.isEmpty()) { // 修改删除的大板对应的小板为未优化 @@ -350,7 +356,11 @@ public class PlanServiceImpl implements PlanService { plateMapper.deleteBatchIds(plateIds); - orderItemMapper.delete(new LambdaQueryWrapperX().in(OrderItemDO::getPlateId, plateIds)); + orderItemMapper.delete(new LambdaQueryWrapperX() + .eq(OrderItemDO::getOrganId,getUserOrganId()) + .in(OrderItemDO::getOrderId,orderIds) + .in(OrderItemDO::getPlateId, plateIds)); + } @@ -361,7 +371,7 @@ public class PlanServiceImpl implements PlanService { } // 删除商品表里的 planId - goodsMapper.deletePlanGoods(ids,getUserOrganId()); + goodsMapper.deletePlanGoods(orderIds,ids,getUserOrganId()); List orderIdList = new ArrayList<>(); @@ -594,9 +604,7 @@ public class PlanServiceImpl implements PlanService { .eqIfPresent("op.is_door", pageReqVO.getIsDoor()) .betweenIfPresent("op.height", new BigDecimal[]{pageReqVO.getLongMinRang(), pageReqVO.getLongMaxRang()}) .betweenIfPresent("op.width", new BigDecimal[]{pageReqVO.getWidthMinRang(), pageReqVO.getWidthMaxRang()}) -// .groupBy("o.id", " o.order_date", "o.delivery_date", "o.customer", "o.address", "o.custom_order_no","o.status") -// .having("count(op.id) != 0") - .orderByDesc("o.order_date"); + .orderByDesc("o.id"); String filterTypes = ""; if (Objects.nonNull(pageReqVO.getHoleThrough()) && pageReqVO.getHoleThrough()) { @@ -872,15 +880,6 @@ public class PlanServiceImpl implements PlanService { - - - @Override - public List getNotPlanPlateListPage(PlateReqPageVO pageVO) { - - List pageRes = plateMapper.selectPlatePage(/*page, */pageVO.getOrderId(),getUserOrganId()/*, pageVO.getGoodsId()*/); - return pageRes; - } - @Override @Transactional(rollbackFor = Exception.class) public Boolean addPlate(AddPlateReq req) { @@ -1123,17 +1122,16 @@ public class PlanServiceImpl implements PlanService { - private void validatePlanExists(Long id) { + private Long validatePlanExists(Long id) { PlanDO planDO = planMapper.selectById(id); -// if ( planDO== null) { -// throw exception(PLAN_NOT_EXISTS); -// } AssertUtils.notEmpty(planDO,PLAN_NOT_EXISTS); if(planDO.getStatus().equals(PlanStatusEnum.OPENING.getStatus()) || planDO.getStatus().equals(PlanStatusEnum.OPENED.getStatus())){ throw exception(LIST_CHANGES_ARE_PROHIBITED); } + + return planDO.getMachineId(); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml index 73c00cb3a..873055b3e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml @@ -42,11 +42,12 @@ UPDATE order_goods SET deleted = #{deleted},plan_id = 0 - WHERE id IN + WHERE organ_id = #{organId} + and order_id = #{orderId} + and id IN #{id} - AND organ_id = #{organId} DELETE FROM order_goods @@ -87,29 +88,6 @@ - - - @@ -187,23 +165,6 @@ - - - - - - - - select distinct order_id, - create_time as updateTime - from order_goods - where organ_id = #{organId} - and deleted = false - and plan_id = 0 - order by create_time; - - diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml index c2e66121a..48fcb61ed 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml @@ -44,8 +44,8 @@ o.status as status from orders o - join order_goods og on o.organ_id = og.organ_id and o.id = og.order_id and og.plan_id = 0 and o.deleted = og.deleted - join order_plate op on o.organ_id = op.organ_id and o.deleted = op.deleted and o.id = op.order_id and op.is_optimized = false and og.id = op.goods_id + STRAIGHT_JOIN order_goods og on o.organ_id = og.organ_id and o.id = og.order_id and og.plan_id = 0 and o.deleted = og.deleted + STRAIGHT_JOIN order_plate op on o.organ_id = op.organ_id and o.deleted = op.deleted and o.id = op.order_id and op.is_optimized = false and og.id = op.goods_id ${ew.customSqlSegment} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml index 5e7e0037f..880522688 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml @@ -186,18 +186,6 @@ - \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml index 1caa4916e..97baf4b55 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml @@ -9,103 +9,6 @@ 文档可见：https://www.cf.com/MyBatis/x-plugins/ --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + UPDATE order_plan + + SET status = #{status}, produce_time = null + + WHERE organ_id = #{organId} + and deleted = false + and id = #{planId} + + + + + + \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml index b55b697af..9e83ed856 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml @@ -3,57 +3,6 @@ - - - - - - - - - - select distinct - c.goods_id as goodsId, - c.width as width, - c.height as height, - c.thickness as thickness, - c.goods_name as goodsName, - c.material as material, - c.color as color, - count(distinct a.id) - - from order_plate a - LEFT JOIN order_item oi on a.id = oi.plate_id and a.order_id = oi.order_id and a.organ_id = oi.organ_id --- LEFT JOIN `orders` b on a.order_id = b.id and a.organ_id = b.organ_id - LEFT JOIN order_goods c on a.goods_id = c.id and a.organ_id = c.organ_id - left join order_plan_item opi on oi.id = opi.item_id and oi.organ_id = opi.organ_id - where - c.organ_id = #{organId} - and a.is_cancel = 0 - and b.status = 2 - and a.deleted = false - and opi.item_id is null - and c.goods_id in - - #{goodsIds} - - - group by c.goods_id,c.id,b.id ,c.goods_name,c.width,c.height,c.thickness, c.material, c.color; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select DISTINCT - ob.room_name as roomName, - ob.name as bodyName, - op.id as palteId, - op.name as plateName, - ogs.material as plateMaterial, - ogs.color as palteColor, - op.height as plateHeight, - op.width as plateWidth, - op.thickness as plateThickness, - op.area as plateArea, - op.texture as texture, - op.remark as remark, - op.is_special_shaped as specialShaped, - op.is_sculpt as profiling, - op.is_row_hole AS rowHole - - from order_plate op - join order_goods ogs on op.goods_id = ogs.id and op.organ_id = ogs.organ_id - join order_item oi on op.id = oi.plate_id and op.organ_id = oi.organ_id - join order_body ob on oi.body_id = ob.id and oi.organ_id = ob.organ_id - - where - oi.order_id = #{orderNo} - and - oi.organ_id = #{organId} - and oi.plate_id != 0 - and - op.id not in ( - select DISTINCT oi2.plate_id - from order_item oi2 - where oi2.order_id = #{orderNo} and oi2.package_id <> ''); - - - - diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/OrdersMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/OrdersMapper.xml index e2367ba45..ff8494b5b 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/OrdersMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/OrdersMapper.xml @@ -22,7 +22,7 @@ splitter as splitter, packaged as packaged FROM orders - WHERE organ_id = #{organId} and deleted = false and status != 0 and create_time >= #{createTime} and id != #{orderId} + WHERE organ_id = #{organId} and deleted = false and status in (1,2,3,4) and create_time >= #{createTime} and id != #{orderId} ORDER BY create_time LIMIT 1 ; @@ -49,7 +49,7 @@ splitter as splitter, packaged as packaged FROM orders - WHERE organ_id = #{organId} and deleted = false and status != 0 and create_time <= #{createTime} and id != #{orderId} + WHERE organ_id = #{organId} and deleted = false and status != 0 and create_time <= #{createTime} and id != #{orderId} ORDER BY create_time desc LIMIT 1 ; @@ -81,43 +81,6 @@ - - @@ -200,7 +163,7 @@ - order by order_date desc + order by create_time desc diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceFiledReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceFiledReqVO.java index 5c1b6bd4b..dc6c4fee1 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceFiledReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceFiledReqVO.java @@ -3,7 +3,6 @@ package com.cf.imes.module.system.controller.admin.datasource.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.ToString; import java.util.List; @@ -17,7 +16,7 @@ public class DataSourceFiledReqVO { @Schema(description = "主键ID") private Long id; - @Schema(description = "数据源id") + @Schema(description = "数据源id-父级ID") private String sourceId; @Schema(description = "字段名称") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingRespVO.java index f8cbbc83d..2e61b3c4a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingRespVO.java @@ -1,12 +1,15 @@ package com.cf.imes.module.system.controller.admin.machine.vo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.fastjson.JSONObject; -import com.cf.imes.module.system.dal.dataobject.machine.CuttingSettingDO; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; @Schema(description = "管理后台 - 机台 Response VO") @Data @@ -16,55 +19,42 @@ import com.alibaba.excel.annotation.*; @AllArgsConstructor public class CuttingRespVO { + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "14092") @ExcelProperty("主键") private Long id; + @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") @ExcelProperty("名称") private String name; + @Schema(description = "1机台设备 2CNC设备", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @ExcelProperty("1机台设备 2CNC设备") private Integer machineType; + @Schema(description = "标签id") private Long labelId; + @Schema(description = "品牌ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") @ExcelProperty("品牌ID") private Long brandId; + @Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + private String brand; -// @Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") -// @ExcelProperty("品牌") -// private String brand; - - -// @Schema(description = "型号", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") -// @ExcelProperty("型号") -// private String model; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") private LocalDateTime createTime; - /* @Schema(description = "机台配置") - private CuttingSettingDO machineSettingDO;*/ @Schema(description = "机台配置") private JSONObject machineSettingDO; - /** - * 机台权限相关配置 - */ - @Schema(description ="加工模式 开料机加工模式 默认true，显示开料机工作模式(是否排钻/造型，sc)配置") - private Boolean showPriorFacing; - @Schema(description = "双工位") - private Boolean showDualWorkstation; - @Schema(description = "自动贴标") - private Boolean showAutoNotePrinter; - } \ 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/machine/MachineServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java index 72d56a515..6e55d82fb 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java @@ -385,13 +385,14 @@ public class MachineServiceImpl implements MachineService { // 对机台的配置进行解压 machineDO.setSetting(JsonUtils.unzipString(machineDO.getSetting())); - LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); - assert loginUser != null; -// MachineLimitDO machineLimitDO = machineLimitMapper.selectOne(new LambdaQueryWrapperX() -// .eq(MachineLimitDO::getMachineId, id) -// .eq(MachineLimitDO::getOrganId, loginUser.getOrganId()) -// ); + Long brandId = machineDO.getBrandId(); + + MachineBrandDO machineBrandDO = machineBrandMapper.selectById(brandId); + CuttingRespVO respVO = MachineConvert.convert(machineDO); + + respVO.setBrand(machineBrandDO.getBrand()); + return respVO; } diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml b/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml index 085a8f37d..ef2ab1101 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml @@ -194,6 +194,7 @@ chenfeng: - system_notify_message_readinfo - system_data_source_field - system_machine_brand + - system_machine_limit use-data-code: imes_prod #动态数据源标识，后期添加的数据源需要修改此值 sms-code: # 短信验证码相关的配置项