From 7697bb249e7e3e5f118e69f2930d602b681e9669 Mon Sep 17 00:00:00 2001
From: Allenxy <13762749+chaosallen@user.noreply.gitee.com>
Date: Thu, 16 Jan 2025 17:20:32 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E5=81=9C=E6=9C=BA=E5=AE=9E=E7=BB=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/constants/enums/WebMatOperateEnum.java |  4 ++--
 .../controller/SteelGradeInfoController.java        |  3 ++-
 .../java/com/fizz/business/domain/CrmPdiPlan.java   |  2 +-
 .../java/com/fizz/business/domain/ProStoppage.java  |  4 ++--
 .../com/fizz/business/form/CalcPdiPlanForm.java     |  2 +-
 .../java/com/fizz/business/form/CrmPdiPlanForm.java |  2 +-
 .../service/impl/CrmPdiPlanServiceImpl.java         | 13 +++----------
 7 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/business/src/main/java/com/fizz/business/constants/enums/WebMatOperateEnum.java b/business/src/main/java/com/fizz/business/constants/enums/WebMatOperateEnum.java
index 23ea869..8c40b56 100644
--- a/business/src/main/java/com/fizz/business/constants/enums/WebMatOperateEnum.java
+++ b/business/src/main/java/com/fizz/business/constants/enums/WebMatOperateEnum.java
@@ -28,10 +28,10 @@ public enum WebMatOperateEnum implements IEnum<String> {
             ONLINE.syncPlanStatus(form.getId(), form.getEntryMatId());
         }
     },
-    NEW("回退") {
+    READY("回退") {
         @Override
         public void operate(WebOperateMatForm form) {
-           NEW.syncPlanStatus(form.getId(), form.getEntryMatId());
+            READY.syncPlanStatus(form.getId(), form.getEntryMatId());
         }
     },
 
diff --git a/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java b/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java
index c96bf52..74ade8f 100644
--- a/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java
+++ b/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java
@@ -29,7 +29,8 @@ public class SteelGradeInfoController {
 
         // 使用 LambdaQueryWrapper 查询 StdAlloy 表中的数据
         LambdaQueryWrapper<StdAlloy> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select(StdAlloy::getGradeid, StdAlloy::getName); // 只查询 gradeId 和 name 字段
+        queryWrapper.select(StdAlloy::getGradeid, StdAlloy::getName) // 只查询 gradeId 和 name 字段
+                .orderByAsc(StdAlloy::getName); // 按 name 排序
 
         // 查询 StdAlloy 数据
         List<StdAlloy> stdAlloyList = steelGradeInfoService.list(queryWrapper);
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 32bd335..1abc83d 100644
--- a/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java
+++ b/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java
@@ -41,7 +41,7 @@ public class CrmPdiPlan implements Serializable {
     private Integer passno;
 
     @ApiModelProperty(value = "退火厚度")
-    private Integer annealThick;
+    private Double annealThick;
 
     @ApiModelProperty(value = "入口厚度")
     private Double entryThick;
diff --git a/business/src/main/java/com/fizz/business/domain/ProStoppage.java b/business/src/main/java/com/fizz/business/domain/ProStoppage.java
index cb994f1..89dedbc 100644
--- a/business/src/main/java/com/fizz/business/domain/ProStoppage.java
+++ b/business/src/main/java/com/fizz/business/domain/ProStoppage.java
@@ -17,7 +17,7 @@ public class ProStoppage implements Serializable {
 
     private Long stopid;
 
-    private String encoilid;
+    private String coilid;
 
     private String shift;
 
@@ -35,7 +35,7 @@ public class ProStoppage implements Serializable {
 
     private Float duration;
 
-    private String insDate;
+    private String insdate;
 
     private String stopType;
 
diff --git a/business/src/main/java/com/fizz/business/form/CalcPdiPlanForm.java b/business/src/main/java/com/fizz/business/form/CalcPdiPlanForm.java
index a088338..21808cc 100644
--- a/business/src/main/java/com/fizz/business/form/CalcPdiPlanForm.java
+++ b/business/src/main/java/com/fizz/business/form/CalcPdiPlanForm.java
@@ -31,7 +31,7 @@ public class CalcPdiPlanForm {
     private Double entryWidth;
 
     @ApiModelProperty(value = "退火厚度")
-    private Integer annealThick;
+    private Double annealThick;
 
     @ApiModelProperty(value = "入口厚度")
     private Double entryThick;
diff --git a/business/src/main/java/com/fizz/business/form/CrmPdiPlanForm.java b/business/src/main/java/com/fizz/business/form/CrmPdiPlanForm.java
index af83500..8c5c469 100644
--- a/business/src/main/java/com/fizz/business/form/CrmPdiPlanForm.java
+++ b/business/src/main/java/com/fizz/business/form/CrmPdiPlanForm.java
@@ -29,7 +29,7 @@ public class CrmPdiPlanForm {
     private Integer passno;
 
     @ApiModelProperty(value = "退火厚度")
-    private Integer annealThick;
+    private Double annealThick;
 
     @ApiModelProperty(value = "入口厚度")
     private Double entryThick;
diff --git a/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java
index 494464b..fb6d745 100644
--- a/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java
+++ b/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java
@@ -132,7 +132,7 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl<CrmPdiPlanMapper, CrmPdiP
 
         CrmPdiPlan crmPdiPlan = this.getById(form.getId());
 
-        if (StringUtils.compare(form.getOperation(), "ONLINE") == 0 && StringUtils.compare(form.getOperation(), "PRODUCT") != 0) {
+        if (StringUtils.compare(form.getOperation(), "READY") == 0 && StringUtils.compare(crmPdiPlan.getStatus(), "ONLINE") == 0 ) {
             crmPdiPlan.setStatus("READY");
             log.info("退回钢卷,matId: {}", form.getCoilId());
             this.updateById(crmPdiPlan);
@@ -142,7 +142,7 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl<CrmPdiPlanMapper, CrmPdiP
         }
 
 
-        if (StringUtils.compare(form.getOperation(), "ONLINE") == 0 && StringUtils.compare(form.getOperation(), "PRODUCT") != 0) {
+        if (StringUtils.compare(form.getOperation(), "ONLINE") == 0 && StringUtils.compare(crmPdiPlan.getStatus(), "PRODUCT") != 0) {
 
             crmPdiPlan.setStatus(form.getOperation());
 
@@ -156,16 +156,9 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl<CrmPdiPlanMapper, CrmPdiP
             ModCoilMap bean = BeanUtil.toBean(crmPdiPlan, ModCoilMap.class);
             modCoilMapService.saveModCoilInfo(bean);
 
-        }
-
-        if (StringUtils.compare(form.getOperation(), "PRODUCT") == 0) {
-
-            modCoilMapService.updateModCoil(form.getCoilId());
+            proMatmapService.updateMatid(form.getCoilId());
 
         }
-
-        proMatmapService.updateMatid(form.getCoilId());
-
     }
 
     @Override