From 166ebf430a54da00d6ce1580ecdcb4df098cfbca Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Thu, 16 Jan 2025 17:22:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=92=E5=8D=95-=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=B7=B7=E5=8D=95=E5=88=A4=E6=96=AD=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E6=8E=92=E5=8D=95-=E6=9D=BF=E6=9D=90?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=E6=9B=B4=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7=EF=BC=8C=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E6=9E=9C=E5=BC=82=E5=B8=B8=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=A1=A5=E5=85=A8=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/plan/vo/OrderPageReqVOCopy.java | 2 +- .../admin/plan/vo/PlanSaveReqVO.java | 4 --- .../executor/dal/mysql/order/OrderMapper.java | 19 ------------ .../dal/mysql/pack/OrderPackageMapper.java | 10 ------- .../executor/dal/mysql/plate/PlateMapper.java | 2 +- .../optimizeplan/OptimizePlanServiceImpl.java | 28 +++++++++++------ .../service/order/OrderServiceImpl.java | 19 ++++++------ .../service/plan/PlanServiceImpl.java | 30 +++++++++++-------- .../service/plate/PlateServiceImpl.java | 19 +++++++----- .../resources/mapper/plate/PlateMapper.xml | 8 ++++- .../manage/service/pack/PackServiceImpl.java | 6 ++++ .../api/systemconfig/SystemConfigApi.java | 6 ++++ .../system/enums/ErrorCodeConstants.java | 1 + .../api/systemconfig/SystemConfigApiImpl.java | 11 +++++++ 14 files changed, 91 insertions(+), 74 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java index 02dda0db8..b4295ae5a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java @@ -85,7 +85,7 @@ public class OrderPageReqVOCopy extends PageParam { @Schema(description = "商品ID-板材库对应的大板ID-由板材查询生产单时传") // @Size(max = 20,message = "最多可同时查询20个板材") - private List goodsId; + private List goodsIds; @Schema(description = "排单ID-修改排单时为必传条件") private Long planId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanSaveReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanSaveReqVO.java index ca1b04676..d799609f3 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanSaveReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanSaveReqVO.java @@ -18,10 +18,6 @@ public class PlanSaveReqVO { private Long id; - @Schema(description = "是否开启混单", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean isMix; - - @Schema(description = "排单状态：0 未开料，1 开料中，2 已开料，3 已投产") // @NotNull(message = "排单状态：0 未开料，1 已投产，2 开料中，3 已开料", groups = UpdateGroup.class) @PlanStatusValid diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java index 08869f1b6..7a9a0a4aa 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java @@ -234,25 +234,6 @@ public interface OrderMapper extends BaseMapperX { List selectOrderDataSource(@Param("filed") String filed,@Param("orderIds") List orderIds,@Param("organId") Long organId); - - - - default List selectOrderIdsList(OrderPageReqVOCopy pageReqVO, List statusList, Long organId) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(OrderDO::getOrganId, organId) - .eq(OrderDO::getDeleted, false) - .in(OrderDO::getStatus,statusList) - .likeIfPresent(OrderDO::getId,pageReqVO.getOrderId() != null ? pageReqVO.getOrderId() : null) - .inIfPresent(OrderDO::getId,pageReqVO.getOrderIds()) - .likeIfPresent(OrderDO::getCustomOrderNo,pageReqVO.getDefaultId()) - .likeIfPresent(OrderDO::getCustomer,pageReqVO.getConsignee()) - .likeIfPresent(OrderDO::getAddress,pageReqVO.getConsigneeAddress()) - .betweenIfPresent(OrderDO::getOrderDate,pageReqVO.getCreateTime()) - .select(OrderDO::getId)); - - } - - List selectGoodsListByGoodsId(@Param(Constants.WRAPPER) QueryWrapperX queryWrapperX); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/pack/OrderPackageMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/pack/OrderPackageMapper.java index 13c465783..5500a45e7 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/pack/OrderPackageMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/pack/OrderPackageMapper.java @@ -1,9 +1,7 @@ package com.cf.imes.module.executor.dal.mysql.pack; -import com.cf.imes.framework.common.enums.OrderPackageStatusEnum; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.module.executor.dal.dataobject.pack.OrderPackageDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,12 +14,4 @@ public interface OrderPackageMapper extends BaseMapperX { void updatePackList(@Param("orderId") Long orderId, @Param("packIds") List packIds, @Param("organId") Long organId); - default List selectPackStatusList(Long orderId,Long organId) { - return selectList(new LambdaQueryWrapperX() - .eq(OrderPackageDO::getOrganId,organId) - .eq(OrderPackageDO::getDeleted,false) - .eq(OrderPackageDO::getStatus, OrderPackageStatusEnum.PACKAGED.getStatus()) - .eqIfPresent(OrderPackageDO::getOrderId, orderId)); - } - } 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 a94d46fe2..05ab11e5f 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 @@ -176,7 +176,7 @@ public interface PlateMapper extends BaseMapperX { List selectPlateListByGoodsIds(@Param("orderIds") List orderIds,@Param("goodsIdList") List goodsIdList, @Param("organId") Long organId); - List selectNoPlanPlate(@Param("orderIds") List orderIds, @Param("organId") Long organId); + List selectNoPlanPlate(@Param("orderIds") List orderIds, @Param("ids") List ids, @Param("organId") Long organId); // 批量删除 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 2b5690a7c..9bba10a23 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 @@ -669,9 +669,25 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { AssertUtils.notEmpty(actualGoodsLists,PLAN_NO_ACTUAL_PLATE); - // 先根据排单查找是否有优化数据，如果有，删除 Long planId = boardModelDO.getPlanId(); + List optimizeBoardModelDOS = esUtils.getEsDocument(FIELD_PLAN_CONFIG_ID,FIELD_PLAN_ID,req.getPlanConfigId(), planId, ORDER_OPTIMIZE_PLATE_MODEL, OptimizeBoardModelDO.class); + + // 删除原来的优化信息 + if(CollUtil.isNotEmpty(optimizeBoardModelDOS)){ + + OptimizeBoardModelDO optimizeBoardModelDO = optimizeBoardModelDOS.get(0); + + Boolean isLock = Optional.ofNullable(optimizeBoardModelDO.getIsLock()).orElse(false); + + if(Boolean.TRUE.equals(isLock)){ + throw exception(THIS_PLAN_IS_LOCK); + } + + esUtils.deleteEsDocument(FIELD_PLAN_CONFIG_ID,FIELD_PLAN_ID,req.getPlanConfigId(),planId,ORDER_OPTIMIZE_PLATE_MODEL); + + } + List plateDOS = planItemMapper.selectOrderPlanPlateListByPlanId(planId,getUserOrganId()); @@ -683,13 +699,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { plateMapper.updateBatch(plateDOS); - List optimizeBoardModelDOS = esUtils.getEsDocument(FIELD_PLAN_CONFIG_ID,FIELD_PLAN_ID,req.getPlanConfigId(), planId, ORDER_OPTIMIZE_PLATE_MODEL, OptimizeBoardModelDO.class); - - // 删除原来的优化信息 - if(CollUtil.isNotEmpty(optimizeBoardModelDOS)){ - esUtils.deleteEsDocument(FIELD_PLAN_CONFIG_ID,FIELD_PLAN_ID,req.getPlanConfigId(),planId,ORDER_OPTIMIZE_PLATE_MODEL); - - } // 保存优化后的大板数据 esUtils.saveEsDocument(ORDER_OPTIMIZE_PLATE_MODEL,req.getOptimizeBoardModelDOS()); @@ -870,12 +879,13 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { AssertUtils.notEmpty(goodsReqVOS,ORDER_GOODS_DATA_ERROR); + List ids = goodsReqVOS.stream().map(GoodsReqVO::getId).toList(); List orderDOS = orderMapper.selectBatchIds(orderIds); AssertUtils.notEmpty(orderDOS,THIS_ORDER_PLATE_DATA_ERROR); - List plateDetailRespVOS = plateMapper.selectNoPlanPlate(orderIds,getUserOrganId()); + List plateDetailRespVOS = plateMapper.selectNoPlanPlate(orderIds,ids,getUserOrganId()); AssertUtils.notEmpty(plateDetailRespVOS,ORDER_PLATE_ERROR); 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 3282d32c6..0066faf7c 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 @@ -1,5 +1,6 @@ package com.cf.imes.module.executor.service.order; +import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -33,7 +34,6 @@ import com.cf.imes.module.executor.dal.dataobject.orderParts.PartsDO; import com.cf.imes.module.executor.dal.dataobject.ordermodel.OrderModelCompressDO; import com.cf.imes.module.executor.dal.dataobject.ordermodel.OrderModelDO; import com.cf.imes.module.executor.dal.dataobject.ordermodel.OrderPlateList; -import com.cf.imes.module.executor.dal.dataobject.pack.OrderPackageDO; 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.plate.PlateGoodDO; @@ -320,7 +320,7 @@ public class OrderServiceImpl implements OrderService { List partsList = orderPartsMapper.selectPartsIdListByBodyId(bodyIds, getUserOrganId(), orderId); if (!partsList.isEmpty()){ -// // 判断是否含有重复的配件 + // 判断是否含有重复的配件 Iterator iterator = partsList.iterator(); while (iterator.hasNext()) { Long id = iterator.next(); // 配件id判断是否重复 @@ -1100,27 +1100,28 @@ public class OrderServiceImpl implements OrderService { // 删除包裹,只需删除，无需还原 - List packIds = orderItemMapper.selectPackId(orderId,bodyIds, getUserOrganId()).stream().map(OrderItemDO::getPackageId).distinct().toList(); + List orderItemDOS = orderItemMapper.selectPackId(orderId, bodyIds, getUserOrganId()); - orderPackageMapper.updatePackList(orderId, packIds, getUserOrganId()); + if(CollUtil.isNotEmpty(orderItemDOS)) { - orderItemMapper.deletePackList(orderId, packIds, getUserOrganId()); + List packIds = orderItemDOS.stream().map(OrderItemDO::getPackageId).distinct().toList(); - orderPrepackagedMapper.deletePacked(orderId, getUserOrganId()); + orderPackageMapper.updatePackList(orderId, packIds, getUserOrganId()); - List orderPackageDOS = orderPackageMapper.selectPackStatusList(orderId, getUserOrganId()); + orderItemMapper.deletePackList(orderId, packIds, getUserOrganId()); - if (orderPackageDOS.isEmpty()) { + orderPrepackagedMapper.deletePacked(orderId, getUserOrganId()); OrderDO orderDO = orderMapper.selectById(orderId); + AssertUtils.notEmpty(orderDO,ORDER_NOT_EXISTS); + orderDO.setPackaged(OrderPackageStatusEnum.UNPACKED.getStatus()); orderMapper.updateById(orderDO); } - // 删除大板 List goodsList = plateMapper.selectPlateDeletedStatus(orderId, goodsIds, getUserOrganId()); 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 b830b66fb..7e86c5ddf 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,6 +151,8 @@ public class PlanServiceImpl implements PlanService { Long processId = systemConfigRespDTO.getId(); + Boolean isMix = systemConfigApi.getMultiColorConfigStatus().getCheckedData(); + ArrayList planDOS = new ArrayList<>(); List ids = new ArrayList<>(); @@ -164,7 +166,7 @@ public class PlanServiceImpl implements PlanService { SavePlanPlateList savePlanPlateList = Optional.ofNullable(createReqVO.getSavePlanPlateList()).orElseThrow(()-> new ServiceException(PLAN_PLATE_DATA_ERROR)); - if (Boolean.TRUE.equals(createReqVO.getIsMix())) { + if (Boolean.TRUE.equals(isMix)) { // 混单时走的逻辑 List plateItemList = Optional.ofNullable(savePlanPlateList.getPlateItemList()).orElseThrow(()-> new ServiceException(PLAN_PLATE_DATA_ERROR)); @@ -654,7 +656,19 @@ public class PlanServiceImpl implements PlanService { statusList.add(OrderStatusEnum.IN_PRODUCTION.getStatus()); statusList.add(OrderStatusEnum.SORTED.getStatus()); - List goodsId = Optional.ofNullable(pageReqVO.getGoodsId()).orElse(new ArrayList<>()); + List goodsId = Optional.ofNullable(pageReqVO.getGoodsIds()).orElse(new ArrayList<>()); + + List ids = new ArrayList<>(); + + if(CollUtil.isNotEmpty(goodsId)) { + + List orderIdList = Optional.ofNullable(pageReqVO.getOrderIds()).orElse(new ArrayList<>()); + + List goodsDOS = goodsMapper.selectListByGoodsId(orderIdList,goodsId, getUserOrganId()); + ids.addAll(goodsDOS.stream().map(GoodsDO::getId).toList()); + + } + QueryWrapperX queryWrapperX = new QueryWrapperX<>(); queryWrapperX @@ -665,7 +679,7 @@ public class PlanServiceImpl implements PlanService { .isNull(FIELD_PLAN_ID) .isNotNull(FIELD_OP_ID) - .inIfPresent("og.goods_id",goodsId) + .inIfPresent("op.goods_id",ids) .inIfPresent("o.id",pageReqVO.getOrderIds()) .likeIfPresent("o.id", pageReqVO.getOrderId() != null ? pageReqVO.getOrderId() : null) .likeIfPresent(FIELD_CUSTOMER, pageReqVO.getConsignee()) @@ -685,16 +699,6 @@ public class PlanServiceImpl implements PlanService { List orderIds = records.stream().map(OrderRespVOCopy::getOrderId).toList(); - List ids = new ArrayList<>(); - - if(CollUtil.isNotEmpty(goodsId)) { - - List goodsDOS = goodsMapper.selectListByGoodsId(orderIds,goodsId, getUserOrganId()); - ids.addAll(goodsDOS.stream().map(GoodsDO::getId).toList()); - - } - - QueryWrapperX queryWrapperX2 = new QueryWrapperX<>(); queryWrapperX2 .eq("op.organ_id",getUserOrganId()) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index 4f0878686..04af26feb 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -327,15 +327,20 @@ public class PlateServiceImpl implements PlateService { List plateResLists = orderMapper.selectNoPlanOrderPlateList(queryWrapperX,pageNo,pageReqVO.getPageSize()); - List plateIds = plateResLists.stream().map(PlateResList::getPlateId).toList(); + if(CollUtil.isEmpty(plateResLists)){ - List orderModelDOS = esUtils.getEsDocument(FIELD_PLATE_ID, plateIds, plateIds.size(), ORDER_PLATE_MODEL, OrderModelDO.class); + return new PageResult<>(); - - PlateModelDetailRespVO.builder() - .plateResLists(new PageResult<>(plateResLists, (long) plateCount.size())) - .plateModels(orderModelDOS) - .build(); + } +// List plateIds = plateResLists.stream().map(PlateResList::getPlateId).toList(); +// +// List orderModelDOS = esUtils.getEsDocument(FIELD_PLATE_ID, plateIds, plateIds.size(), ORDER_PLATE_MODEL, OrderModelDO.class); +// +// +// PlateModelDetailRespVO.builder() +// .plateResLists(new PageResult<>(plateResLists, (long) plateCount.size())) +// .plateModels(orderModelDOS) +// .build(); return new PageResult<>(plateResLists, (long) plateCount.size()); 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 dd544fbbc..64e445f34 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 @@ -521,13 +521,19 @@ left join order_plan_item opi on op.organ_id = opi.organ_id and op.order_id = opi.order_id and op.id = opi.plate_id where op.organ_id = #{organId} - and op.deleted = false and op.order_id in #{orderIds} + and op.goods_id in + + #{ids} + + + and op.deleted = false + and opi.plan_id is null diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java index c23967ed1..af423809a 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java @@ -150,6 +150,12 @@ public class PackServiceImpl implements PackService { @Override public List getOrdersPlateList(List orderIds) { +// List orderDOS = ordersMapper.selectBatchIds(orderIds); +// orderDOS.forEach(f->{ +// if(OrderPackageStatusEnum.PACKAGED.equals(f.getPackaged())){ +//// throw exception(ORDER_IS_PACK_ERROR,f.getId()); +// } +// }); List plateDetailsRespVOS = orderPlateMapper.selectOrderPlateList(orderIds,getUserOrganId()); diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/systemconfig/SystemConfigApi.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/systemconfig/SystemConfigApi.java index 5060faee9..0b728cb1a 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/systemconfig/SystemConfigApi.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/systemconfig/SystemConfigApi.java @@ -49,4 +49,10 @@ public interface SystemConfigApi { @GetMapping(PREFIX + "/organ/process-config") @Operation(summary = "获取排单下加工方案组的配置信息和具体配置项的配置信息") CommonResult> getProcessById(@RequestParam("processId") Long processId); + + + @GetMapping(PREFIX + "/organ/multi-color-config-status") + @Operation(summary = "查询组织的混单是否开启") + CommonResult getMultiColorConfigStatus(); + } 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 9bf823381..bf48ea642 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 @@ -345,6 +345,7 @@ public class ErrorCodeConstants { public static final ErrorCode THIS_PLAN_PLATE_DATA_ERROR = new ErrorCode(1_002_041_039, "当前排单对应的板材数据为空，请重新进行排单或检查生产单对应的板材信息"); public static final ErrorCode PLAN_PROCESS_CONFIG_IS_NULL = new ErrorCode(1_002_041_040, "排单：{} 对应的方案组为空，请进行配置"); public static final ErrorCode PLAN_PROCESS_CONFIG_ALL_IS_NULL = new ErrorCode(1_002_041_041, "当前所选排单对应的方案组配置均为空，请重新进行方案组配置"); + public static final ErrorCode THIS_PLAN_IS_LOCK = new ErrorCode(1_002_041_042, "当前排单已被锁定，无法进行优化，请解锁后再进行优化"); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/systemconfig/SystemConfigApiImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/systemconfig/SystemConfigApiImpl.java index 578133c70..3deec6dc7 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/systemconfig/SystemConfigApiImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/systemconfig/SystemConfigApiImpl.java @@ -237,6 +237,17 @@ public class SystemConfigApiImpl implements SystemConfigApi { return success(schemeDTOS); } + @Override + public CommonResult getMultiColorConfigStatus() { + + + List systemConfigDOS = systemConfigMapper.selectSystemConfigList(SystemConfigTypeEnum.MULTI_COLOR_ORDER_PLAN.getType(), CommonStatusEnum.ENABLE.getStatus()); + + + return success(CollUtil.isNotEmpty(systemConfigDOS)); + + } + private void checkValueIsNotEmpty(List value,String error) {