mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
机台删除,工序加工,排单加工时间,排单数据筛选Bug修改
This commit is contained in:
+8
-2
@@ -1,6 +1,7 @@
|
||||
package com.cf.imes.module.system.api.process;
|
||||
|
||||
|
||||
import com.cf.imes.module.system.api.process.dto.ProcessDTO;
|
||||
import com.cf.imes.module.system.enums.ApiConstants;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
@@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
@FeignClient(name = ApiConstants.NAME) // TODO 晨丰:fallbackFactory =
|
||||
@Tag(name = "RPC 服务 - 工序")
|
||||
@@ -21,9 +23,13 @@ public interface ProcessApi {
|
||||
|
||||
@GetMapping(PREFIX + "/getProcess")
|
||||
@Operation(summary = "查看当前工序的信息")
|
||||
// @Parameter(name = "processId", description = "工序ID", required = true, example = "1024")
|
||||
BigDecimal getProcess(/*@RequestParam("processId") Long processId*/);
|
||||
@Parameter(name = "processId", description = "工序ID", required = true, example = "1024")
|
||||
BigDecimal getProcess(@RequestParam("processId") Long processId);
|
||||
|
||||
|
||||
@GetMapping(PREFIX + "/getUserProcess")
|
||||
@Operation(summary = "查看当前工序的信息")
|
||||
@Parameter(name = "userId", description = "用户ID", required = true, example = "1")
|
||||
List<ProcessDTO> getUserProcess(@RequestParam("userId") Long userId);
|
||||
|
||||
}
|
||||
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
package com.cf.imes.module.system.api.process.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;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ProcessDTO {
|
||||
|
||||
@Schema(description = "工序ID")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "工序名称")
|
||||
private String name;
|
||||
|
||||
@Schema(description = "工序类型")
|
||||
private Integer type;
|
||||
|
||||
|
||||
}
|
||||
+1
@@ -208,6 +208,7 @@ public interface ErrorCodeConstants {
|
||||
ErrorCode DEFAULT_TEMPLATE_NOT_DELETED = new ErrorCode(1_002_029_004, "不能删除默认模板");
|
||||
ErrorCode NOT_TEMPLATE_AUTH = new ErrorCode(1_002_029_005, "该组织无此机台模板权限");
|
||||
ErrorCode NOT_MACHINE_AUTH = new ErrorCode(1_002_029_005, "该组织无此机台权限");
|
||||
ErrorCode THE_CURRENT_MACHINE_IS_ALREADY_IN_USE = new ErrorCode(1_002_029_005, "当前机台已使用,禁止删除");
|
||||
|
||||
// ========== 标签模板 1-002-300-000 ==========
|
||||
ErrorCode LABEL_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_300_000, "标签模板不存在");
|
||||
|
||||
Reference in New Issue
Block a user