From 7903d8ff962b03a233c5a3ea26907e37ff566713 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Wed, 13 Nov 2024 17:20:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=AE=A1=E7=90=86--=E9=A2=86?=
 =?UTF-8?q?=E6=96=99=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/biz/enums/LeaseTaskStatusEnum.java | 24 +++++++++++++++++++
 .../biz/enums/PurchaseTaskStatusEnum.java     |  4 +---
 .../impl/LeaseApplyInfoServiceImpl.java       |  5 ++--
 3 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java

diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java
new file mode 100644
index 00000000..9ea25c98
--- /dev/null
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java
@@ -0,0 +1,24 @@
+package com.bonus.common.biz.enums;
+
+import lombok.Getter;
+
+/**
+ * @author : 阮世耀
+ * @version : 1.0
+ * 领料任务状态枚举
+ */
+@Getter
+public enum LeaseTaskStatusEnum {
+
+    LEASE_TASK_NO_PUBLISHED(0, "领料任务--未发布"),
+    LEASE_TASK_PUBLISHED(1, "领料任务--已发布"),
+    LEASE_TASK_FINISH(2, "领料任务--已完成");
+
+    private final Integer status;
+    private final String statusName;
+
+    LeaseTaskStatusEnum(Integer status, String statusName) {
+        this.status = status;
+        this.statusName = statusName;
+    }
+}
diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java
index a9403ad7..63ad4c2a 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java
@@ -18,9 +18,7 @@ public enum PurchaseTaskStatusEnum {
     IN_STORE(19, "已入库"),
     TASK_TO_START(20, "入库待开始"),
     TASK_IN_PROGRESS(21, "入库进行中"),
-    TASK_FINISHED(22, "入库已完成"),
-    LEASE_TASK_NO_PUBLISHED(0, "领料任务--未发布"),
-    LEASE_TASK_PUBLISHED(1, "领料任务--已发布");
+    TASK_FINISHED(22, "入库已完成");
 
     private final Integer status;
     private final String statusName;
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
index 11bfa242..0380e9f8 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
@@ -5,6 +5,7 @@ import java.util.Optional;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.bonus.common.biz.constant.MaterialConstants;
+import com.bonus.common.biz.enums.LeaseTaskStatusEnum;
 import com.bonus.common.biz.enums.PurchaseTaskStatusEnum;
 import com.bonus.common.biz.enums.TmTaskTypeEnum;
 import com.bonus.common.core.exception.ServiceException;
@@ -151,14 +152,14 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
         }
 
         leaseApplyInfo.setUpdateTime(DateUtils.getNowDate());
-        leaseApplyInfo.setStatus(String.valueOf(PurchaseTaskStatusEnum.LEASE_TASK_PUBLISHED.getStatus()));
+        leaseApplyInfo.setStatus(String.valueOf(LeaseTaskStatusEnum.LEASE_TASK_PUBLISHED.getStatus()));
         try {
             int result = leaseApplyInfoMapper.updateLeaseApplyInfo(leaseApplyInfo);
             if (result > 0) {
                 // 同步修改tm_task任务状态
                 TmTask tmTask = new TmTask();
                 tmTask.setTaskId(leaseApplyInfo.getTaskId());
-                tmTask.setStatus(String.valueOf(PurchaseTaskStatusEnum.LEASE_TASK_PUBLISHED.getStatus()));
+                tmTask.setStatus(String.valueOf(LeaseTaskStatusEnum.LEASE_TASK_PUBLISHED.getStatus()));
                 tmTaskMapper.updateTmTask(tmTask);
                 return AjaxResult.success("发布成功");
             }