From 9c6ed3c68d14053aa5eb4d41e57627cb55e1dcb8 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Tue, 2 Jul 2024 16:13:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=92=E5=8D=95-?= =?UTF-8?q?=E6=9D=BF=E6=9D=90=E5=88=86=E7=BB=84=E6=8E=A5=E5=8F=A3=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=EF=BC=9B=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=B0=8F=E6=9D=BF=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/order/OrderController.java | 11 ++ .../order/vo/product/OrderRoomBodyRespVO.java | 25 ++++ .../admin/plan/OptimizePlanController.java | 10 ++ .../controller/admin/plan/vo/GoodsReqVO.java | 2 +- .../admin/plan/vo/OrderGoodsResp.java | 2 +- .../admin/plate/PlateController.java | 8 ++ .../plate/vo/OptimizationSavePlateReqVO.java | 96 ++++++++++++++ .../executor/dal/mysql/goods/GoodsMapper.java | 19 ++- .../executor/dal/mysql/order/OrderMapper.java | 3 + .../dal/mysql/orderBody/OrderBodyMapper.java | 3 + .../executor/dal/mysql/plate/PlateMapper.java | 2 +- .../optimizeplan/OptimizePlanService.java | 3 + .../optimizeplan/OptimizePlanServiceImpl.java | 14 +++ .../executor/service/order/OrderService.java | 7 ++ .../service/order/OrderServiceImpl.java | 19 +++ .../executor/service/plan/PlanService.java | 4 +- .../service/plan/PlanServiceImpl.java | 119 +++++++++++------- .../executor/service/plate/PlateService.java | 2 + .../service/plate/PlateServiceImpl.java | 74 +++++++++++ .../resources/mapper/goods/GoodsMapper.xml | 42 +++++++ .../resources/mapper/order/OrderMapper.xml | 19 ++- .../mapper/orderBody/OrderBodyMapper.xml | 26 ++++ .../resources/mapper/plate/PlateMapper.xml | 86 ++----------- .../dal/mysql/pack/OrderPackageMapper.xml | 3 +- 24 files changed, 465 insertions(+), 134 deletions(-) create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/product/OrderRoomBodyRespVO.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OptimizationSavePlateReqVO.java diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java index 4fd7102d5..b15e165e1 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.executor.controller.admin.order.vo.order.*; import com.cf.imes.module.executor.controller.admin.order.vo.product.OrderBodyRespVO; +import com.cf.imes.module.executor.controller.admin.order.vo.product.OrderRoomBodyRespVO; import com.cf.imes.module.executor.controller.admin.orderParts.vo.OrderPartsRespVO; import com.cf.imes.module.executor.dal.dataobject.goods.GoodsDO; import com.cf.imes.module.executor.util.ExcelWriterUtil; @@ -151,6 +152,16 @@ public class OrderController { return success(orderBodyMap); } + @GetMapping("/get-room-and-body") + @Operation(summary = "获取柜体和房间信息") + @Parameter(name = "planId", description = "排单ID", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('production:manager-list:detail')") + public CommonResult> getRoomAndBody(@RequestParam("planId") Long planId) { + List orderBodyMap = orderService.getRoomAndBody(planId); + return success(orderBodyMap); + } + + @GetMapping("/get-module") @Operation(summary = "生产单详情-数量信息") @Parameter(name = "orderId", description = "生产单编号", example = "1024") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/product/OrderRoomBodyRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/product/OrderRoomBodyRespVO.java new file mode 100644 index 000000000..340fde907 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/product/OrderRoomBodyRespVO.java @@ -0,0 +1,25 @@ +package com.cf.imes.module.executor.controller.admin.order.vo.product; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "管理后台 - 生产单房间和柜体信息") +@Data +public class OrderRoomBodyRespVO { + + + @Schema(description = "柜体ID") + private Long bodyId; + + @Schema(description = "柜体名称") + private String bodyName; + + @Schema(description = "房间ID") + private Long roomId; + + @Schema(description = "房间名称") + private String roomName; + + +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java index 08170e682..b85ed7373 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java @@ -5,6 +5,7 @@ import com.cf.imes.framework.operatelog.core.annotations.OperateLog; import com.cf.imes.module.executor.controller.admin.plan.bo.OrderSource; import com.cf.imes.module.executor.controller.admin.plan.saveOptimize.SavePlanPlateResultReqVO; import com.cf.imes.module.executor.controller.admin.plan.vo.*; +import com.cf.imes.module.executor.controller.admin.plate.vo.PlateSaveReqVO; import com.cf.imes.module.executor.service.optimizeplan.OptimizePlanService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Schema; @@ -19,6 +20,8 @@ import javax.validation.constraints.NotNull; import java.util.List; import java.util.Map; +import static com.cf.imes.framework.common.pojo.CommonResult.success; + /** * @author there */ @@ -61,6 +64,13 @@ public class OptimizePlanController { return CommonResult.success(optimizePlanService.commit(planId)); } + @PutMapping("/endCutting") + @Operation(summary = "结束开料") + @PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')") + public CommonResult endCutting(@Valid @RequestBody @NotNull(message = "排单id不能空") Long planId) { + return success(optimizePlanService.endCutting(planId)); + } + @GetMapping("/getOptimizeParam") @Operation(summary = "获取优化算法参数") @PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GoodsReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GoodsReqVO.java index 17cc7e4f0..99955e1d1 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GoodsReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GoodsReqVO.java @@ -42,7 +42,7 @@ public class GoodsReqVO { private String color; @Schema(description = "纹路") - private Integer texture; + private Boolean texture; @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) private BigDecimal width; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderGoodsResp.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderGoodsResp.java index 6655a5902..64e4c1809 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderGoodsResp.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderGoodsResp.java @@ -39,7 +39,7 @@ public class OrderGoodsResp { private Long num; - @Schema(description = "订单对应的板件的信息") + @Schema(description = "生产单信息") private List orderList; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java index adac103b4..d2a04b35e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java @@ -122,4 +122,12 @@ public class PlateController { } + @PostMapping("/insertPlate") + @Operation(summary = "优化生产创建板材") + @PreAuthorize("@ss.hasPermission('executor:plate:create')") + public CommonResult> createNewPlate(@Valid @RequestBody OptimizationSavePlateReqVO reqVO) { + return success(plateService.createNewPlate(reqVO)); + } + + } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OptimizationSavePlateReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OptimizationSavePlateReqVO.java new file mode 100644 index 000000000..99c78f8f4 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OptimizationSavePlateReqVO.java @@ -0,0 +1,96 @@ +package com.cf.imes.module.executor.controller.admin.plate.vo; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Schema(description = "管理后台 - 优化生产时新增的小板信息") +public class OptimizationSavePlateReqVO { + + + @Schema(description = "柜体号") + private Long bodyId; + + + @Schema(description = "柜体名称") + private String bodyName; + + + @Schema(description = "房间号") + private Long roomId; + + + @Schema(description = "房间名称") + private String roomName; + + + @Schema(description = "排单ID") + private Long planId; + + @Schema(description = "生产单号") + private Long orderId; + + + @Schema(description = "板名称") + private String name; + + + @Schema(description = "板类型，0 层板 1 立板 2 背板") + private Integer type; + + + @Schema(description = "商品ID") + private Long goodsId; + + @Schema(description = "纹路类型，0 正纹 1 可翻转 2 反纹") + private Integer texture; + + + @Schema(description = "宽度") + private BigDecimal width; + + + @Schema(description = "高度") + private BigDecimal height; + + + @Schema(description = "左封边厚度") + private BigDecimal sealLeft; + + + @Schema(description = "右封边厚度") + private BigDecimal sealRight; + + + @Schema(description = "上封边厚度") + private BigDecimal sealUp; + + + @Schema(description = "下封边厚度") + private BigDecimal sealDown; + + + + @Schema(description = "倍数") + private Integer multiple ; + + + + @Schema(description = "备注1") + private String remake1; + + + @Schema(description = "备注2") + private String remake2; + +} 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 45bfe4a9d..1934a12b9 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 @@ -3,10 +3,14 @@ package com.cf.imes.module.executor.dal.mysql.goods; import java.util.*; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; import com.cf.imes.module.executor.controller.admin.plan.vo.GoodsReqVO; +import com.cf.imes.module.executor.controller.admin.plan.vo.OrderGoodsResp; +import com.cf.imes.module.executor.controller.admin.plan.vo.OrderPageReqVOCopy; import com.cf.imes.module.executor.dal.dataobject.goods.GoodsDO; import com.cf.imes.module.executor.dal.dataobject.orderGroup.OrderGroupDO; import org.apache.ibatis.annotations.Mapper; @@ -72,4 +76,17 @@ public interface GoodsMapper extends BaseMapperX { // 删板材，批量 void updateDeletedById(@Param("ids") List ids, @Param("deleted") Integer deleted, @Param("organId") Long organId); - } \ No newline at end of file + + IPage selectGoods(@Param("page") IPage page,@Param("goodsIds") List goodsIds,@Param("organId") Long organId); + + + + + default GoodsDO selectId(Long orderId, Long goodsId, Long organId) { + return selectOne(new LambdaQueryWrapperX() + .eq(GoodsDO::getOrganId, organId) + .eq(GoodsDO::getOrderId, orderId) + .eq(GoodsDO::getGoodsId,goodsId) + .eq(GoodsDO::getDeleted, 0)); + } +} \ No newline at end of file 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 550d5928b..13ec85117 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 @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; 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.framework.mybatis.core.query.QueryWrapperX; import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPageReqVO; import com.cf.imes.module.executor.controller.admin.plan.bo.OrderIds; import com.cf.imes.module.executor.controller.admin.plan.vo.OrderRespVOCopy; @@ -126,4 +127,6 @@ public interface OrderMapper extends BaseMapperX { List selectOrderListByIds(@Param("orderIds") List orderIds, @Param("organId")Long organId); + + List selectOrderIds(@Param(Constants.WRAPPER) Wrapper wrapper); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java index 964afb347..005a910e4 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java @@ -5,6 +5,7 @@ import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderModuleRespVO; import com.cf.imes.module.executor.controller.admin.order.vo.product.OrderBodyRespVO; +import com.cf.imes.module.executor.controller.admin.order.vo.product.OrderRoomBodyRespVO; import com.cf.imes.module.executor.dal.dataobject.order.OrderDO; import com.cf.imes.module.executor.dal.dataobject.orderBody.OrderBodyDO; import org.apache.ibatis.annotations.Mapper; @@ -61,4 +62,6 @@ public interface OrderBodyMapper extends BaseMapperX { .eq(OrderBodyDO::getOrganId, organId)); } + + List selectRoomAndBody(@Param("orderIds") List orderIds, @Param("organId") Long organId); } \ No newline at end of file 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 b30373190..06dbd7ee0 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 @@ -130,7 +130,7 @@ public interface PlateMapper extends BaseMapperX { IPage selectGoodsList(@Param("page") IPage page,@Param("pageReqVO") OrderPageReqVOCopy pageReqVO,@Param("organId") Long organId); - List selectOrderIds(@Param("pageReqVO") OrderPageReqVOCopy pageReqVO,@Param("organId") Long organId); + List selectOrderIds(@Param("orderIds") List orderIds,@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/OptimizePlanService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanService.java index ce8e65e7f..faef00978 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanService.java @@ -21,6 +21,8 @@ public interface OptimizePlanService { Boolean commit(Long planId); + Boolean endCutting(Long planId); + OptimizeParamResVO getOptimizeParam(Long planId); OptimizeParamRespVO getOptimizePlanParam(Long planId); @@ -37,4 +39,5 @@ public interface OptimizePlanService { void saveOptimizationResults(SavePlanPlateResultReqVO req); + } 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 aa4de61a1..84900c11c 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 @@ -196,6 +196,20 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { return Boolean.TRUE; } + @Override + 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.OPENEDMATERIAL.getStatus()) + .build()); + return Boolean.TRUE; + + } + @Override public OptimizeParamResVO getOptimizeParam(Long planId) { //小板列表 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java index 5938373b5..4deea5952 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java @@ -5,6 +5,7 @@ import javax.validation.*; import com.cf.imes.module.executor.controller.admin.order.vo.order.*; import com.cf.imes.module.executor.controller.admin.order.vo.product.OrderBodyRespVO; +import com.cf.imes.module.executor.controller.admin.order.vo.product.OrderRoomBodyRespVO; import com.cf.imes.module.executor.controller.admin.orderParts.vo.OrderPartsRespVO; import com.cf.imes.module.executor.dal.dataobject.goods.GoodsDO; import com.cf.imes.module.executor.dal.dataobject.order.OrderDO; @@ -76,6 +77,10 @@ public interface OrderService { */ List getOrderBody(Long orderId); + + List getRoomAndBody(Long planId); + + /** * @param orderId: 生产单Id * @return Map> @@ -161,4 +166,6 @@ public interface OrderService { * 自定义单号是否存在 */ Boolean customOrderNoIsExists(String customOrderNo); + + } \ No newline at end of file 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 fdf6cf77b..14f0941d7 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,6 +1,7 @@ package com.cf.imes.module.executor.service.order; import cn.smallbun.screw.core.util.CollectionUtils; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import com.cf.imes.framework.mybatis.core.generator.SnowFlakeGenerator; @@ -8,6 +9,7 @@ import com.cf.imes.framework.organ.core.context.OrganContextHolder; import com.cf.imes.module.executor.controller.admin.order.vo.order.*; import com.cf.imes.framework.datapermission.core.util.DataPermissionUtils; import com.cf.imes.module.executor.controller.admin.order.vo.product.OrderBodyRespVO; +import com.cf.imes.module.executor.controller.admin.order.vo.product.OrderRoomBodyRespVO; import com.cf.imes.module.executor.controller.admin.orderParts.vo.OrderPartsRemark; import com.cf.imes.module.executor.controller.admin.orderParts.vo.OrderPartsRespVO; import com.cf.imes.module.executor.controller.admin.plate.vo.PlateGoodsIdVO; @@ -18,6 +20,7 @@ import com.cf.imes.module.executor.dal.dataobject.orderGroup.OrderGroupDO; import com.cf.imes.module.executor.dal.dataobject.orderItem.OrderItemDO; import com.cf.imes.module.executor.dal.dataobject.orderParts.OrderPartsDO; 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.plate.PlateGoodDO; import com.cf.imes.module.executor.dal.dataobject.rawgoods.RawGoodsDO; @@ -26,6 +29,7 @@ import com.cf.imes.module.executor.dal.mysql.orderBody.OrderBodyMapper; import com.cf.imes.module.executor.dal.mysql.orderGroup.OrderGroupMapper; import com.cf.imes.module.executor.dal.mysql.orderItem.OrderItemMapper; import com.cf.imes.module.executor.dal.mysql.orderParts.OrderPartsMapper; +import com.cf.imes.module.executor.dal.mysql.plan.PlanMapper; import com.cf.imes.module.executor.dal.mysql.plate.PlateGoodMapper; import com.cf.imes.module.executor.dal.mysql.plate.PlateMapper; import com.cf.imes.module.executor.dal.mysql.process.OrderProcessMapper; @@ -66,6 +70,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; import static com.cf.imes.module.executor.enums.ErrorCodeConstants.*; import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; @@ -95,6 +100,9 @@ public class OrderServiceImpl implements OrderService { @Resource private PlateMapper plateMapper; + @Resource + private PlanMapper planMapper; + @Resource private PlateGoodMapper plateGoodMapper; @@ -261,6 +269,17 @@ public class OrderServiceImpl implements OrderService { return orderBodyRespVOList; } + @Override + public List getRoomAndBody(Long planId) { + + PlanDO planDO = planMapper.selectById(planId); + + List orderIds = JSON.parseArray(planDO.getOrderNos()).toJavaList(Long.class); + + return orderBodyMapper.selectRoomAndBody(orderIds,getUserOrganId()); + + } + @Override public Map> getModule(Long orderId) { // 判断生产单是否删除 (包含判断存在） 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 cc2eb16a0..066549d73 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 @@ -56,6 +56,8 @@ public interface PlanService { PageResult getOrderPage(OrderPageReqVOCopy pageReqVO); + PageResult getOrderGoodsPage(OrderPageReqVOCopy pageReqVO); + List getNotPlanPlateListPage(PlateReqPageVO pageVO); Boolean addPlate(AddPlateReq req); @@ -72,6 +74,6 @@ public interface PlanService { List getPlateList(List planIds); - PageResult getOrderGoodsPage(OrderPageReqVOCopy pageReqVO); + } \ No newline at end of file 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 ad15df70f..7ed3a28b2 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 @@ -376,13 +376,85 @@ public class PlanServiceImpl implements PlanService { // 处理后的 filteredRecords 将不包含过滤后的数据为空的 record orderRespVOCopies.setRecords(filteredRecords); - orderRespVOCopies.setTotal(orderRespVOCopies.getRecords().size()); +// orderRespVOCopies.setTotal(orderRespVOCopies.getRecords().size()); return new PageResult<>(orderRespVOCopies.getRecords(), orderRespVOCopies.getTotal()); } + + + + + @Override + public PageResult getOrderGoodsPage(OrderPageReqVOCopy pageReqVO) { + + + PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + + QueryWrapperX queryWrapperX = new QueryWrapperX<>(); + queryWrapperX + .eq("a.organ_id",getUserOrganId()) + .eq("a.status",OrderStatusEnum.NO_SORT.getStatus()) + .eq("a.deleted",false) + .likeIfPresent("a.id", pageReqVO.getOrderId() != null ? pageReqVO.getOrderId().toString() : null) +// .isNull("opi.item_id") + .eqIfPresent("a.customer", pageReqVO.getConsignee()) + .eqIfPresent("a.custom_order_no", pageReqVO.getDefaultId()) + .eqIfPresent("a.address", pageReqVO.getConsigneeAddress()) + .betweenIfPresent("a.create_time", pageReqVO.getCreateTime()) + .eqIfPresent("op.is_special_shaped", pageReqVO.getRectangle() != null ? false: null) + .eqIfPresent("op.is_special_shaped", pageReqVO.getSpecialShaped()) + .eqIfPresent("op.is_sculpt", pageReqVO.getSculpt()) + .eqIfPresent("op.is_door", pageReqVO.getIsDoor()) + .betweenIfPresent("op.height", new BigDecimal[]{pageReqVO.getLongMinRang(), pageReqVO.getLongMaxRang()}) + .betweenIfPresent("op.width", new BigDecimal[]{pageReqVO.getWidthMinRang(), pageReqVO.getWidthMaxRang()}); + List filterTypes = new ArrayList<>(); + if (Objects.nonNull(pageReqVO.getHoleThrough()) && pageReqVO.getHoleThrough()) { + filterTypes.add(PlanFilterTypeEnum.DIGGINGTHROUGHTHESHAPE.getType()); + } + if (Objects.nonNull(pageReqVO.getBurrow()) && pageReqVO.getBurrow()) { + filterTypes.add(PlanFilterTypeEnum.THEREAREPERFORATEDHOLES.getType()); + } + if (Objects.nonNull(pageReqVO.getTwoDimensionalToolPath()) && pageReqVO.getTwoDimensionalToolPath()) { + filterTypes.add(PlanFilterTypeEnum.TWODIMENSIONALCUTTINGPATH.getType()); + } + + queryWrapperX.inIfPresent("op.filter_type", filterTypes); + + + List orderIds = orderMapper.selectOrderIds(queryWrapperX); + + + List orderIdsList = plateMapper.selectOrderIds(orderIds,getUserOrganId()); + + + List goodsList = orderIdsList.stream().map(OrderIds::getGoodsId).distinct().toList(); + + + IPage orderGoodsResps = goodsMapper.selectGoods(page,goodsList, getUserOrganId()); + + + List orderRespVOCopies = orderMapper.selectOrderListByIds(orderIdsList, getUserOrganId()); + + + for (OrderGoodsResp record : orderGoodsResps.getRecords()) { + record.setOrderIds(orderIdsList.stream().filter(e -> Objects.equals(e.getGoodsId(), record.getGoodsId())).collect(Collectors.toList())); + record.setOrderList(orderRespVOCopies.stream().filter(e -> Objects.equals(e.getGoodsId(), record.getGoodsId())).collect(Collectors.toList())); + } + + + return new PageResult<>(orderGoodsResps.getRecords(), orderGoodsResps.getTotal()); + + } + + + + + + + @Override public List getNotPlanPlateListPage(PlateReqPageVO pageVO) { @@ -543,49 +615,4 @@ public class PlanServiceImpl implements PlanService { - @Override - public PageResult getOrderGoodsPage(OrderPageReqVOCopy pageReqVO) { - - - PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - - - List filterTypes = new ArrayList<>(); - if (Objects.nonNull(pageReqVO.getHoleThrough()) && pageReqVO.getHoleThrough()) { - filterTypes.add(PlanFilterTypeEnum.DIGGINGTHROUGHTHESHAPE.getType()); - } - if (Objects.nonNull(pageReqVO.getBurrow()) && pageReqVO.getBurrow()) { - filterTypes.add(PlanFilterTypeEnum.THEREAREPERFORATEDHOLES.getType()); - } - if (Objects.nonNull(pageReqVO.getTwoDimensionalToolPath()) && pageReqVO.getTwoDimensionalToolPath()) { - filterTypes.add(PlanFilterTypeEnum.TWODIMENSIONALCUTTINGPATH.getType()); - } - - - - IPage orderGoodsRespIPage = plateMapper.selectGoodsList(page,pageReqVO,getUserOrganId()); - - - if (CollectionUtil.isEmpty(orderGoodsRespIPage.getRecords())) { - return new PageResult<>(); - } - - - List orderIds = plateMapper.selectOrderIds(pageReqVO,getUserOrganId()); - - - - List orderRespVOCopies = orderMapper.selectOrderListByIds(orderIds, getUserOrganId()); - - - for (OrderGoodsResp record : orderGoodsRespIPage.getRecords()) { - record.setOrderIds(orderIds.stream().filter(e -> Objects.equals(e.getGoodsId(), record.getGoodsId())).collect(Collectors.toList())); - record.setOrderList(orderRespVOCopies.stream().filter(e -> Objects.equals(e.getGoodsId(), record.getGoodsId())).collect(Collectors.toList())); - } - - - return new PageResult<>(orderGoodsRespIPage.getRecords(), orderGoodsRespIPage.getTotal()); - - } - } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java index 403414730..6007ac72c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java @@ -92,4 +92,6 @@ public interface PlateService { List getPlateModelByPlateId(List bodyIds); + List createNewPlate(OptimizationSavePlateReqVO reqVO); + } \ No newline at end of file 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 63637b5ef..925c1c793 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 @@ -21,10 +21,15 @@ import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.executor.controller.admin.goods.vo.GoodsSaveReqVO; import com.cf.imes.module.executor.dal.dataobject.orderItem.OrderItemDO; import com.cf.imes.module.executor.dal.dataobject.ordermodel.OrderModelDO; +import com.cf.imes.module.executor.dal.dataobject.planitem.PlanItemDO; import com.cf.imes.module.executor.dal.dataobject.processStepItem.OrderProcessStepItemDO; +import com.cf.imes.module.executor.dal.mysql.goods.GoodsMapper; import com.cf.imes.module.executor.dal.mysql.orderItem.OrderItemMapper; +import com.cf.imes.module.executor.dal.mysql.planitem.PlanItemMapper; import com.cf.imes.module.executor.dal.mysql.processStepItem.ProcessStepItemMapper; +import com.cf.imes.module.executor.enums.OrderItemType; import com.cf.imes.module.executor.util.RandomUtils; +import com.cf.imes.module.executor.util.fileConversion.admin.SnowflakeIdWorker3rd; import com.cf.imes.module.system.enums.ErrorCodeConstants; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; @@ -73,6 +78,15 @@ public class PlateServiceImpl implements PlateService { @Resource private OrderItemMapper orderItemMapper; + @Resource + private GoodsMapper goodsMapper; + + @Resource + private PlanItemMapper planItemMapper; + + @Resource + private SnowflakeIdWorker3rd idWorker; + @Resource private ElasticsearchClient elasticsearchClient; @@ -236,9 +250,69 @@ public class PlateServiceImpl implements PlateService { + @Override + @Transactional(rollbackFor = Exception.class) + public List createNewPlate(OptimizationSavePlateReqVO reqVO) { + + List plateDOS = new ArrayList<>(); + + for (int i = 0; i < reqVO.getMultiple(); i++) { + + // 生成板编号 + long plateNo = idWorker.nextId(); + long obtainingTime = SnowflakeIdWorker3rd.obtainingTime(); + + PlateDO plateDO = BeanUtils.toBean(reqVO, PlateDO.class); + + plateDO.setRemark(reqVO.getRemake1() +","+ reqVO.getRemake2()); + + Long goodsId = goodsMapper.selectId(reqVO.getOrderId(), reqVO.getGoodsId(), getUserOrganId()).getId(); + + plateDO.setGoodsId(goodsId); + + plateDO.setPlateNo((obtainingTime) + Long.toString(plateNo).substring(2)); + + plateDO.setArea(reqVO.getWidth().multiply(reqVO.getHeight()).movePointLeft(4).stripTrailingZeros()); + + plateDOS.add(plateDO); + } + + plateMapper.insertBatch(plateDOS); + + List orderItemDOS = new ArrayList<>(); + + plateDOS.forEach(plateDO -> { + // 生产单明细表新增数据 + OrderItemDO orderItemDO = OrderItemDO.builder() + .orderId(reqVO.getOrderId()) + .type(OrderItemType.BOARD.getCode()) + .roomId(reqVO.getRoomId()) + .bodyId(reqVO.getBodyId()) + .plateId(plateDO.getId()) + .build(); + orderItemDOS.add(orderItemDO); + } + ); + + orderItemMapper.insertBatch(orderItemDOS); + List planItemDOS = new ArrayList<>(); + orderItemDOS.forEach(orderItemDO ->{ + + PlanItemDO planItemDO = PlanItemDO.builder() + .planId(reqVO.getPlanId()) + .itemId(orderItemDO.getId()) + .build(); + planItemDOS.add(planItemDO); + }); + + // 排单明细表新增数据 + planItemMapper.insertBatch(planItemDOS); + + return plateDOS.stream().map(PlateDO::getId).toList(); + } private List buildRespByPlateIds(Collection plateIds, String index) { 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 f5ae792a3..ccf31d04b 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 @@ -52,4 +52,46 @@ AND organ_id = #{organId} + + + + + + + + + + + + + + + + \ No newline at end of file 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 da13ce838..c8cc23a30 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 @@ -14,6 +14,21 @@ + + + + @@ -57,7 +72,8 @@ (#{orderIds.goodsId}) - group by o.id,o.custom_order_no, o.customer,o.address,o.order_date,o.delivery_date, o.update_time,o.status,og.goods_id; + group by o.id,o.custom_order_no, o.customer,o.address,o.order_date,o.delivery_date, o.update_time,o.status,og.goods_id + order by o.id @@ -67,5 +83,4 @@ - \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderBody/OrderBodyMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderBody/OrderBodyMapper.xml index 40d5bceec..cc1b0e091 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderBody/OrderBodyMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderBody/OrderBodyMapper.xml @@ -30,4 +30,30 @@ FROM `order_body` b WHERE b.order_id = #{orderId} and b.organ_id = #{organId} + + + + \ 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 11416fe1a..92dd8b47e 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 @@ -402,51 +402,13 @@ 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 a.order_id like concat('%', #{pageReqVO.orderId},'%') - - - and b.custom_order_no = #{pageReqVO.defaultId} - - - and b.customer = #{pageReqVO.consignee} - - - and b.address = #{pageReqVO.consigneeAddress} - - - and b.create_time between #{pageReqVO.createTime[0]} and #{pageReqVO.createTime[1]} - - - and a.is_special_shaped = false - - - and a.is_special_shaped = #{pageReqVO.specialShaped} - - - and a.is_sculpt = #{pageReqVO.sculpt} - - - and a.is_door = #{pageReqVO.isDoor} - - - and a.height between #{pageReqVO.longMinRang} and #{pageReqVO.longMaxRang} - - - and a.width between #{pageReqVO.widthMinRang} and #{pageReqVO.widthMaxRang} - - - and a.filter_type in (pageReqVO.holeThrough,pageReqVO.burrow,pageReqVO.twoDimensionalToolPath) - - - group by c.goods_id,c.id,b.id ,c.goods_name,c.width,c.height,c.thickness, c.material, c.color; @@ -464,50 +426,16 @@ 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 a.order_id like concat('%', #{pageReqVO.orderId},'%') - - - and b.custom_order_no = #{pageReqVO.defaultId} - - - and b.customer = #{pageReqVO.consignee} - - - and b.address = #{pageReqVO.consigneeAddress} - - - and b.create_time between #{pageReqVO.createTime[0]} and #{pageReqVO.createTime[1]} - - - and a.is_special_shaped = false - - - and a.is_special_shaped = #{pageReqVO.specialShaped} - - - and a.is_sculpt = #{pageReqVO.sculpt} - - - and a.is_door = #{pageReqVO.isDoor} - - - and a.height between #{pageReqVO.longMinRang} and #{pageReqVO.longMaxRang} - - - and a.width between #{pageReqVO.widthMinRang} and #{pageReqVO.widthMaxRang} - - - and a.filter_type in (pageReqVO.holeThrough,pageReqVO.burrow,pageReqVO.twoDimensionalToolPath) - - - + and c.order_id in + + #{orderIds} + + order by a.order_id \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml index b2f194543..104fce185 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml @@ -22,8 +22,7 @@ from order_package op join order_item oi on op.id = oi.package_id and op.organ_id = oi.organ_id where - op.status <> 0 - and oi.package_id != 0 + oi.package_id != 0 and op.organ_id = #{organId} and op.order_id in From 22c430ddf44fec361d9c2ba1f5c69811cfb0442f Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Tue, 2 Jul 2024 17:07:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=BC=80=E6=96=99?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/plan/OptimizePlanController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java index b85ed7373..a81799d41 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java @@ -64,10 +64,10 @@ public class OptimizePlanController { return CommonResult.success(optimizePlanService.commit(planId)); } - @PutMapping("/endCutting") + @GetMapping("/endCutting") @Operation(summary = "结束开料") @PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')") - public CommonResult endCutting(@Valid @RequestBody @NotNull(message = "排单id不能空") Long planId) { + public CommonResult endCutting(@RequestParam @Valid @NotNull(message = "排单id不能空") Long planId) { return success(optimizePlanService.endCutting(planId)); }