From d034775c740934edc749037fb51a85dfd696219e Mon Sep 17 00:00:00 2001
From: Allenxy <13762749+chaosallen@user.noreply.gitee.com>
Date: Thu, 10 Oct 2024 10:09:04 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E6=94=B9=E5=9B=9E=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fizz/business/controller/CrmPdiPlanController.java  | 4 ++--
 .../fizz/business/controller/CrmPdoExcoilController.java    | 3 ++-
 .../src/main/java/com/fizz/business/domain/CrmPdiPlan.java  | 6 +++---
 .../src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java    | 6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java b/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java
index c117490..37d9133 100644
--- a/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java
+++ b/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java
@@ -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));
     }
 
diff --git a/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java b/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java
index 466cae4..f828646 100644
--- a/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java
+++ b/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java
@@ -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}")
diff --git a/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java b/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java
index a84440e..749412e 100644
--- a/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java
+++ b/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java
@@ -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;
diff --git a/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java b/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java
index 6da3c3f..478fd52 100644
--- a/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java
+++ b/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java
@@ -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;