feat():改回普通类型
This commit is contained in:
@@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@@ -19,13 +20,12 @@ import java.util.List;
|
||||
@Api("南钢计划接口")
|
||||
public class CrmPdiPlanController {
|
||||
|
||||
@Autowired
|
||||
@Resource
|
||||
private CrmPdiPlanService crmPdiPlanService;
|
||||
|
||||
@GetMapping("/get/{coilid}")
|
||||
@ApiOperation("通过钢卷号查询计划")
|
||||
public R<CrmPdiPlanVO> getByCoilId(@PathVariable String coilid) {
|
||||
|
||||
return R.ok(crmPdiPlanService.getByCoilIdAndOperId(coilid));
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@@ -17,7 +18,7 @@ import java.util.List;
|
||||
@Api("南钢实绩接口")
|
||||
public class CrmPdoExcoilController {
|
||||
|
||||
@Autowired
|
||||
@Resource
|
||||
private CrmPdoExcoilService crmPdoExcoilService;
|
||||
|
||||
@GetMapping("/get/{excoilid}/{operid}")
|
||||
|
||||
@@ -28,7 +28,7 @@ public class CrmPdiPlan implements Serializable {
|
||||
private Integer operid;
|
||||
|
||||
@ApiModelProperty(value = "轧制模式")
|
||||
private OperModeEnum operMode;
|
||||
private Integer operMode;
|
||||
|
||||
@ApiModelProperty(value = "钢卷id")
|
||||
private String coilid;
|
||||
@@ -64,7 +64,7 @@ public class CrmPdiPlan implements Serializable {
|
||||
private String exitCoilid;
|
||||
|
||||
@ApiModelProperty(value = "下工序代码")
|
||||
private NextUnitEnum nextUnit;
|
||||
private String nextUnit;
|
||||
|
||||
@ApiModelProperty(value = "分切数量")
|
||||
private Integer splitNum;
|
||||
@@ -112,7 +112,7 @@ public class CrmPdiPlan implements Serializable {
|
||||
private Integer tensileStrength;
|
||||
|
||||
@ApiModelProperty(value = "状态")
|
||||
private PlanStatusEnum status;
|
||||
private String status;
|
||||
|
||||
@ApiModelProperty(value = "计划号")
|
||||
private String planNo;
|
||||
|
||||
@@ -23,7 +23,7 @@ public class CrmPdiPlanVO {
|
||||
private Integer operid;
|
||||
|
||||
@ApiModelProperty(value = "轧制模式")
|
||||
private OperModeEnum operMode;
|
||||
private Integer operMode;
|
||||
|
||||
@ApiModelProperty(value = "卷ID")
|
||||
private String coilid;
|
||||
@@ -59,7 +59,7 @@ public class CrmPdiPlanVO {
|
||||
private String exitCoilid;
|
||||
|
||||
@ApiModelProperty(value = "下工序代码")
|
||||
private NextUnitEnum nextUnit;
|
||||
private String nextUnit;
|
||||
|
||||
@ApiModelProperty(value = "分割数量")
|
||||
private Integer splitNum;
|
||||
@@ -107,7 +107,7 @@ public class CrmPdiPlanVO {
|
||||
private Integer tensileStrength;
|
||||
|
||||
@ApiModelProperty(value = "状态")
|
||||
private PlanStatusEnum status;
|
||||
private String status;
|
||||
|
||||
@ApiModelProperty(value = "计划号")
|
||||
private String planNo;
|
||||
|
||||
Reference in New Issue
Block a user