From 866182653840ff1759177576151ac9d0638a87dd Mon Sep 17 00:00:00 2001 From: yangsb Date: Tue, 9 Apr 2024 17:08:10 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E6=9C=BA?= =?UTF-8?q?=E5=8F=B0=E4=B8=8E=E6=A0=87=E7=AD=BE=E8=AF=A6=E6=83=85rpc?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C2.=E5=AE=9A=E4=B9=89=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=94=9F=E4=BA=A7=E5=8D=95=E6=BA=90=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/plan/OptimizePlanController.java | 9 ++++ .../controller/admin/plan/bo/OrderSource.java | 46 +++++++++++++++++++ .../admin/plate/vo/PlateDetailVO.java | 2 +- .../module/system/api/machine/MachineApi.java | 6 +++ .../system/api/machine/dto/MachineDTO.java | 38 +++++++++++++++ .../system/api/machine/MachineApiImpl.java | 21 +++++++++ 6 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderSource.java create mode 100644 cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/machine/dto/MachineDTO.java 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 d6557acbd..ca15b526e 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 @@ -2,8 +2,10 @@ package com.cf.imes.module.executor.controller.admin.plan; import com.cf.imes.framework.common.pojo.CommonResult; 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.vo.*; import com.cf.imes.module.executor.service.optimizeplan.OptimizePlanService; +import com.cf.imes.module.executor.util.RandomUtils; import com.cf.imes.module.system.api.dataSource.DataSourceApi; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -88,6 +90,13 @@ public class OptimizePlanController { return CommonResult.success(optimizePlanParam); } + @GetMapping("/getOrderSource") + @Operation(summary = "获取生产单源数据 - mock") + @PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')") + public CommonResult getOrderSource(@RequestParam(required = false) Long orderId, @RequestParam(required = false) Long plateId) { + return CommonResult.success(RandomUtils.randomPojo(OrderSource.class)); + } + @GetMapping("/getLabelDataSourceValue") @Operation(summary = "获取标签数据源value") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderSource.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderSource.java new file mode 100644 index 000000000..816e99ccf --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderSource.java @@ -0,0 +1,46 @@ +package com.cf.imes.module.executor.controller.admin.plan.bo; + +import com.cf.imes.module.executor.controller.admin.plan.vo.OptimizeParamRespVO; +import com.cf.imes.module.executor.controller.admin.plate.vo.PlateDetailVO; +import com.cf.imes.module.executor.dal.dataobject.goods.GoodsDO; +import com.cf.imes.module.executor.dal.dataobject.order.OrderDO; +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.system.api.machine.dto.MachineDTO; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @author Beal + * 生产单源数据对象 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class OrderSource { + @Schema(description = "机台数据") + private MachineDTO machineDTO; + + @Schema(description = "排单数据") + private OptimizeParamRespVO planDO; + + @Schema(description = "生产单列表") + private List orders; + + @Schema(description = "商品板材列表") + private List goods; + + @Schema(description = "小板列表") + private List plates; + + @Schema(description = "小板详情列表") + private List plateDetails; + + +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java index f487ca817..68f405934 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java @@ -31,7 +31,7 @@ public class PlateDetailVO { private Boolean newVersion; @Schema(description = "原始点详情列表") - private List olgPointDetailList; + private List oldPointDetailList; @Schema(description = "开料尺寸") private KaiLiaoSize kaiLiaoSize; diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/machine/MachineApi.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/machine/MachineApi.java index 315897c10..46f3140d6 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/machine/MachineApi.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/machine/MachineApi.java @@ -2,6 +2,7 @@ package com.cf.imes.module.system.api.machine; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.module.system.api.machine.dto.CuttingRespDTO; +import com.cf.imes.module.system.api.machine.dto.MachineDTO; import com.cf.imes.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -36,4 +37,9 @@ public interface MachineApi { @Parameter(name = "ids", description = "机台id", example = "1024", required = true) CommonResult> list(@RequestParam("ids") Collection ids); + @GetMapping(PREFIX + "/get-machine-detail") + @Operation(summary = "获得机台详情") + @Parameter(name = "id", description = "机台id", example = "1024", required = true) + CommonResult getMachineDetail(@RequestParam("id") Long id); + } diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/machine/dto/MachineDTO.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/machine/dto/MachineDTO.java new file mode 100644 index 000000000..ad96b464f --- /dev/null +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/machine/dto/MachineDTO.java @@ -0,0 +1,38 @@ +package com.cf.imes.module.system.api.machine.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +/** + * @author Beal + * + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class MachineDTO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "14092") + private Long id; + + @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + private String name; + + @Schema(description = "1机台设备 2CNC设备", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + private Integer machineType; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + + @Schema(description = "机台配置") + private String setting; + + @Schema(description = "标签配置") + private String label; +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/machine/MachineApiImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/machine/MachineApiImpl.java index f63d9e5ce..2eb2fc074 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/machine/MachineApiImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/machine/MachineApiImpl.java @@ -1,9 +1,13 @@ package com.cf.imes.module.system.api.machine; import com.cf.imes.framework.common.pojo.CommonResult; +import com.cf.imes.framework.common.util.json.JsonUtils; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.module.system.api.machine.dto.CuttingRespDTO; +import com.cf.imes.module.system.api.machine.dto.MachineDTO; +import com.cf.imes.module.system.controller.admin.label.vo.LabelRespVO; import com.cf.imes.module.system.controller.admin.machine.vo.CuttingRespVO; +import com.cf.imes.module.system.service.lable.LabelService; import com.cf.imes.module.system.service.machine.MachineService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -22,6 +26,9 @@ public class MachineApiImpl implements MachineApi { @Resource private MachineService machineService; + @Resource + private LabelService labelService; + @Override public CommonResult getCutting(Long id) { return success(BeanUtils.toBean(machineService.getCutting(id), CuttingRespDTO.class)); @@ -36,4 +43,18 @@ public class MachineApiImpl implements MachineApi { public CommonResult> list(Collection ids) { return success(BeanUtils.toBean(machineService.list(ids), CuttingRespDTO.class)); } + + @Override + public CommonResult getMachineDetail(Long id) { + CuttingRespVO cutting = machineService.getCutting(id); + LabelRespVO label = labelService.getLabel(cutting.getLabelId()); + MachineDTO machineDTO = MachineDTO.builder() + .id(cutting.getId()) + .machineType(cutting.getMachineType()) + .name(cutting.getName()) + .setting(cutting.getMachineSettingDO().toJSONString()) + .label(JsonUtils.toJsonString(label)) + .build(); + return success(machineDTO); + } }