1.新增获取机台与标签详情rpc接口,2.定义获取生产单源数据接口

This commit is contained in:
yangsb
2024-04-09 17:08:10 +08:00
parent 0903907e65
commit 8661826538
6 changed files with 121 additions and 1 deletions
@@ -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<OrderSource> getOrderSource(@RequestParam(required = false) Long orderId, @RequestParam(required = false) Long plateId) {
return CommonResult.success(RandomUtils.randomPojo(OrderSource.class));
}
@GetMapping("/getLabelDataSourceValue")
@Operation(summary = "获取标签数据源value")
@@ -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<OrderDO> orders;
@Schema(description = "商品板材列表")
private List<GoodsDO> goods;
@Schema(description = "小板列表")
private List<PlateDO> plates;
@Schema(description = "小板详情列表")
private List<PlateDetailVO> plateDetails;
}
@@ -31,7 +31,7 @@ public class PlateDetailVO {
private Boolean newVersion;
@Schema(description = "原始点详情列表")
private List<OldPointDetail> olgPointDetailList;
private List<OldPointDetail> oldPointDetailList;
@Schema(description = "开料尺寸")
private KaiLiaoSize kaiLiaoSize;