From ca1eda6280ea51c2506fd045fc0f2071456c1c86 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 14 Nov 2024 14:20:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java | 4 ++-- .../material/lease/controller/LeaseApplyInfoController.java | 4 ++-- .../lease/service/impl/LeaseApplyInfoServiceImpl.java | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) 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 index 909bc4fe..5b7b8c6a 100644 --- 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 @@ -12,8 +12,8 @@ public enum LeaseTaskStatusEnum { LEASE_TASK_TO_PUBLISHED(1, "待发布"), LEASE_TASK_TO_AUDIT(2, "待审核"), - LEASE_TASK_IN_STOCK_OUT(3, "出库进行中"), - LEASE_TASK_END_STOCK_OUT(4, "出库已完成"); + LEASE_TASK_IN_PROGRESS(3, "出库进行中"), + LEASE_TASK_FINISHED(4, "出库已完成"); private final Integer status; private final String statusName; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java index 79707d89..c7ed7b09 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java @@ -77,9 +77,9 @@ public class LeaseApplyInfoController extends BaseController { //@RequiresPermissions("lease:info:add") @SysLog(title = "领料任务", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增领料任务") @PostMapping - public AjaxResult add(@NotNull(message = "领料任务不能为空") @RequestBody LeaseApplyRequestVo tmTaskRequestVo) { + public AjaxResult add(@NotNull(message = "领料任务不能为空") @RequestBody LeaseApplyRequestVo leaseApplyRequestVo) { try { - return leaseApplyInfoService.insertLeaseApplyInfo(tmTaskRequestVo); + return leaseApplyInfoService.insertLeaseApplyInfo(leaseApplyRequestVo); } catch (Exception e) { return error("系统错误, " + e.getMessage()); } 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 2c2d3e5c..e448c2d6 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 @@ -157,11 +157,11 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { try { int result = leaseApplyInfoMapper.updateLeaseApplyInfo(leaseApplyInfo); if (result > 0) { - // 同步修改tm_task任务状态, 如果不需要审核，改成 LEASE_TASK_IN_STOCK_OUT， 如果需要审核，改成 LEASE_TASK_TO_AUDIT + // 同步修改tm_task任务状态, 如果不需要审核，改成 LEASE_TASK_IN_PROGRESS， 如果需要审核，改成 LEASE_TASK_TO_AUDIT TmTask tmTask = new TmTask(); tmTask.setTaskType(TmTaskTypeEnum.TM_TASK_LEASE.getTaskTypeId()); tmTask.setTaskId(leaseApplyInfo.getTaskId()); - tmTask.setTaskStatus(LeaseTaskStatusEnum.LEASE_TASK_IN_STOCK_OUT.getStatus()); + tmTask.setTaskStatus(LeaseTaskStatusEnum.LEASE_TASK_IN_PROGRESS.getStatus()); tmTaskMapper.updateTmTask(tmTask); return AjaxResult.success("发布成功"); } @@ -180,7 +180,6 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { details.setParentId(taskId); // 设置领料taskId details.setCreateTime(DateUtils.getNowDate()); details.setCreateBy(SecurityUtils.getUsername()); - //details.setStatus(PurchaseTaskStatusEnum.TO_NOTICE.getStatus()); } // 批量插入详情数据 int count = leaseApplyDetailsMapper.insertLeaseApplyDetailsList(leaseApplyDetailsList);