From f695b59337121fb6c93251e73bdfb3fc8e847cc8 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期五, 25 七月 2025 17:07:09 +0800 Subject: [PATCH] 调拔单功能优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java index 06600e0..9767a12 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java @@ -9,9 +9,16 @@ import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; +import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams; +import com.vincent.rsf.server.manager.controller.params.TransferItemParams; import com.vincent.rsf.server.manager.entity.Transfer; +import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate; import com.vincent.rsf.server.manager.service.TransferService; +import com.vincent.rsf.server.system.constant.SerialRuleCode; import com.vincent.rsf.server.system.controller.BaseController; +import com.vincent.rsf.server.system.utils.SerialRuleUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -19,6 +26,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.*; +@Api("璋冩嫈鍗�") @RestController public class TransferController extends BaseController { @@ -59,6 +67,12 @@ transfer.setCreateTime(new Date()); transfer.setUpdateBy(getLoginUserId()); transfer.setUpdateTime(new Date()); + + if (Objects.isNull(transfer.getCode())) { + String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, transfer); + transfer.setCode(ruleCode); + } + if (!transferService.save(transfer)) { return R.error("Save Fail"); } @@ -101,6 +115,45 @@ return R.ok().add(vos); } + @PostMapping("/transfer/items/save") + @ApiOperation("淇濆瓨涓诲崟鍙婃槑缁�") + @PreAuthorize("hasAuthority('manager:transfer:save')") + public R saveOutStock(@RequestBody TransferItemParams params) throws Exception { + if (Objects.isNull(params)) { + return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return transferService.saveTransfer(params, getLoginUserId()); + } + + @ApiOperation("鍗曟嵁淇℃伅淇敼") + @PostMapping("/transfer/items/update") + @PreAuthorize("hasAuthority('manager:outStock:update')") + public R orderAndrItemUpdate(@RequestBody TransferItemParams params) throws Exception { + if (Objects.isNull(params)) { + return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return transferService.updateTransfer(params, getLoginUserId()); + } + + + + /** + * @author Ryan + * @description 涓嬭浇妯℃澘 + * @param + * @return + * @time 2025/4/18 08:17 + */ + @PostMapping("/transfer/template/download") + @ApiOperation("涓嬭浇鐩樼偣鍗曟ā鏉�") + @PreAuthorize("hasAuthority('manager:transfer:update')") + public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception { + CheckOrderTemplate template = ExcelUtil.mockData(CheckOrderTemplate.class); + List<CheckOrderTemplate> list = Arrays.asList(template); + ExcelUtil.build(ExcelUtil.create(list, CheckOrderTemplate.class, true), response); + } + + @PreAuthorize("hasAuthority('manager:transfer:list')") @PostMapping("/transfer/export") public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception { -- Gitblit v1.9.1