DeXun/be-process-control-system
9
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat():改回普通类型

Browse Source
This commit is contained in:
Allenxy
2024-10-10 10:09:04 +08:00
parent c1f37d7764
commit d034775c74
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java
View File

@@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List; import java.util.List;
@RestController @RestController
@@ -19,13 +20,12 @@ import java.util.List;
@Api("南钢计划接口") @Api("南钢计划接口")
public class CrmPdiPlanController { public class CrmPdiPlanController {
@Autowired @Resource
private CrmPdiPlanService crmPdiPlanService; private CrmPdiPlanService crmPdiPlanService;
@GetMapping("/get/{coilid}") @GetMapping("/get/{coilid}")
@ApiOperation("通过钢卷号查询计划") @ApiOperation("通过钢卷号查询计划")
public R<CrmPdiPlanVO> getByCoilId(@PathVariable String coilid) { public R<CrmPdiPlanVO> getByCoilId(@PathVariable String coilid) {
return R.ok(crmPdiPlanService.getByCoilIdAndOperId(coilid)); return R.ok(crmPdiPlanService.getByCoilIdAndOperId(coilid));
} }

3
business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java
View File

@@ -10,6 +10,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List; import java.util.List;
@RestController @RestController
@@ -17,7 +18,7 @@ import java.util.List;
@Api("南钢实绩接口") @Api("南钢实绩接口")
public class CrmPdoExcoilController { public class CrmPdoExcoilController {
@Autowired @Resource
private CrmPdoExcoilService crmPdoExcoilService; private CrmPdoExcoilService crmPdoExcoilService;
@GetMapping("/get/{excoilid}/{operid}") @GetMapping("/get/{excoilid}/{operid}")

6
business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java
View File

@@ -28,7 +28,7 @@ public class CrmPdiPlan implements Serializable {
private Integer operid; private Integer operid;
@ApiModelProperty(value = "轧制模式") @ApiModelProperty(value = "轧制模式")
private OperModeEnum operMode; private Integer operMode;
@ApiModelProperty(value = "钢卷id") @ApiModelProperty(value = "钢卷id")
private String coilid; private String coilid;
@@ -64,7 +64,7 @@ public class CrmPdiPlan implements Serializable {
private String exitCoilid; private String exitCoilid;
@ApiModelProperty(value = "下工序代码") @ApiModelProperty(value = "下工序代码")
private NextUnitEnum nextUnit; private String nextUnit;
@ApiModelProperty(value = "分切数量") @ApiModelProperty(value = "分切数量")
private Integer splitNum; private Integer splitNum;
@@ -112,7 +112,7 @@ public class CrmPdiPlan implements Serializable {
private Integer tensileStrength; private Integer tensileStrength;
@ApiModelProperty(value = "状态") @ApiModelProperty(value = "状态")
private PlanStatusEnum status; private String status;
@ApiModelProperty(value = "计划号") @ApiModelProperty(value = "计划号")
private String planNo; private String planNo;

6
business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java
View File

@@ -23,7 +23,7 @@ public class CrmPdiPlanVO {
private Integer operid; private Integer operid;
@ApiModelProperty(value = "轧制模式") @ApiModelProperty(value = "轧制模式")
private OperModeEnum operMode; private Integer operMode;
@ApiModelProperty(value = "卷ID") @ApiModelProperty(value = "卷ID")
private String coilid; private String coilid;
@@ -59,7 +59,7 @@ public class CrmPdiPlanVO {
private String exitCoilid; private String exitCoilid;
@ApiModelProperty(value = "下工序代码") @ApiModelProperty(value = "下工序代码")
private NextUnitEnum nextUnit; private String nextUnit;
@ApiModelProperty(value = "分割数量") @ApiModelProperty(value = "分割数量")
private Integer splitNum; private Integer splitNum;
@@ -107,7 +107,7 @@ public class CrmPdiPlanVO {
private Integer tensileStrength; private Integer tensileStrength;
@ApiModelProperty(value = "状态") @ApiModelProperty(value = "状态")
private PlanStatusEnum status; private String status;
@ApiModelProperty(value = "计划号") @ApiModelProperty(value = "计划号")
private String planNo; private String planNo;