diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java index eddec7ad..cd05d759 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java @@ -44,6 +44,7 @@ public class BackApplyInfoController extends BaseController { @RequiresPermissions("back:info:list") @GetMapping("/list") public TableDataInfo list(BackApplyInfo backApplyInfo) { + backApplyInfo.setIsExport(false); startPage(); List list = backApplyInfoService.selectBackApplyInfoList(backApplyInfo); return getDataTable(list); @@ -113,12 +114,25 @@ public class BackApplyInfoController extends BaseController { } } + @ApiOperation(value = "修改退料任务打印状态") + @PreventRepeatSubmit + @RequiresPermissions("back:info:edit") + @SysLog(title = "退料任务", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改退料任务") + @PostMapping("/editPrintStatus") + public AjaxResult editPrintStatus(@RequestBody BackApplyInfo dto) { + try { + return backApplyInfoService.editPrintStatus(dto); + } catch (Exception e) { + return error("系统错误, " + e.getMessage()); + } + } + /** * 退料申请提交 */ @ApiOperation(value = "退料申请提交") - //@PreventRepeatSubmit - //@RequiresPermissions("back:info:submit") + @PreventRepeatSubmit + @RequiresPermissions("back:info:submit") @SysLog(title = "退料任务", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->退料申请提交") @PostMapping("/submitBackApply") public AjaxResult submitBackApply(@RequestBody BackApplyInfo backApplyInfo) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java index c63fa3e6..6939d38d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java @@ -74,4 +74,11 @@ public interface IBackApplyInfoService { * @return */ AjaxResult submitBackApply(BackApplyInfo backApplyInfo); + + /** + * 确认打印 + * @param dto + * @return + */ + AjaxResult editPrintStatus(BackApplyInfo dto); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java index 61633f0b..ed775ef4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java @@ -594,6 +594,17 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } + /** + * 编辑打印状态 + * @param dto + * @return + */ + @Override + public AjaxResult editPrintStatus(BackApplyInfo dto) { + int result = backApplyInfoMapper.updateBackApplyInfo(dto); + return result > 0 ? AjaxResult.success() : AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); + } + /** * 更新任务表及退料申请表状态 * @param backApplyInfo diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml index 74f3cd86..904a9923 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml @@ -513,6 +513,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" back_time = #{backTime}, status = #{status}, direct_id = #{directId}, + print_status = #{printStatus}, where id = #{id}