From 7a4651df59afeea750d9512831a41f97c2294869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Fri, 1 Dec 2023 10:36:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/controller/issueJob/IssueJobMainController.java     | 6 +++---
 .../controller/issueRequest/vo/IssueRequestMainExcelVO.java | 4 ++--
 .../module/wms/service/issueJob/IssueJobMainService.java    | 2 +-
 .../wms/service/issueJob/IssueJobMainServiceImpl.java       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java
index b191424a..a2119b23 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java
@@ -220,9 +220,9 @@ public class IssueJobMainController {
     @PutMapping("/execute")
     @Operation(summary = "执行任务")
     @PreAuthorize("@ss.hasPermission('wms:issue-job-main:execute')")
-    public CommonResult<Boolean> executeIssueJobMain(@Valid @RequestBody IssueJobMainUpdateReqVO updateReqVO) {
-        Integer count = issueJobMainService.executeIssueJobMain(updateReqVO);
-        return success(count > 0);
+    public CommonResult<String> executeIssueJobMain(@Valid @RequestBody IssueJobMainUpdateReqVO updateReqVO) {
+        String number = issueJobMainService.executeIssueJobMain(updateReqVO);
+        return success(number);
     }
 
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExcelVO.java
index bc17529c..701b07b5 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExcelVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExcelVO.java
@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.issueRequest.vo;
 
 import com.win.module.wms.enums.DictTypeConstants;
+import com.win.module.wms.enums.request.RequestStatusConverter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -69,8 +70,7 @@ public class IssueRequestMainExcelVO {
     @ExcelProperty("部门")
     private String departmentCode;
 
-    @ExcelProperty(value = "状态", converter = DictConvert.class)
-    @DictFormat("request_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    @ExcelProperty(value = "状态", converter = RequestStatusConverter.class)
     private String status;
 
     @ExcelProperty("最后更新时间")
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java
index 798e2e4e..7ca9d8b3 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java
@@ -104,5 +104,5 @@ public interface IssueJobMainService {
      * @param issueJobMainUpdateReqVO
      * @return
      */
-    Integer executeIssueJobMain(IssueJobMainUpdateReqVO issueJobMainUpdateReqVO);
+    String executeIssueJobMain(IssueJobMainUpdateReqVO issueJobMainUpdateReqVO);
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java
index 2077bde6..c65b5f47 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java
@@ -224,7 +224,7 @@ public class IssueJobMainServiceImpl implements IssueJobMainService {
 
     @Override
     @Transactional
-    public Integer executeIssueJobMain(IssueJobMainUpdateReqVO issueJobMainUpdateReqVO) {
+    public String executeIssueJobMain(IssueJobMainUpdateReqVO issueJobMainUpdateReqVO) {
         //查询数据
         IssueJobMainDO issueJobMainDO = this.validateIssueJobMainExists(issueJobMainUpdateReqVO.getId());
         List<IssueJobDetailDO> subList = issueJobDetailService.selectList(issueJobMainDO.getId());
@@ -351,7 +351,7 @@ public class IssueJobMainServiceImpl implements IssueJobMainService {
         expectoutService.deleteExpectoutByJobNumber(issueJobMainDO.getNumber());
         //变更记录
         trendsApi.createTrends(issueJobMainDO.getId(), "issueJob", "执行了发料任务", TrendsTypeEnum.UPDATE);
-        return result;
+        return number;
     }
 
     /**