发料任务执行修改返回

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);
     }
 
 }

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("最后更新时间")

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);
 }

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;
     }
 
     /**