From 669fe984048785873c20fbd0ce8abb3cd52c1fce Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 29 四月 2025 15:22:24 +0800 Subject: [PATCH] 新增出库单优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java | 36 +++++++++++++++++++++++++++++++++--- 1 files changed, 33 insertions(+), 3 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java index 6b9d1d0..6c9ff33 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java @@ -10,12 +10,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.IsptOrderParam; import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem; import com.vincent.rsf.server.manager.entity.QlyInspect; import com.vincent.rsf.server.manager.service.QlyInspectService; +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.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -58,6 +62,27 @@ return R.ok(qlyInspectService.listByAsn(map)); } + @PostMapping("/qlyInspect/asn/list") + @ApiOperation("鑾峰彇寰呰川妫�鍗�") + @PreAuthorize("hasAuthority('manager:qlyInspect:list')") + public R getUnInspect(@RequestBody Map<String, Object> map) { + if (Objects.isNull(map)) { + return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return R.ok(qlyInspectService.getUnInspect(map)); + } + + @PostMapping("/qlyInspect/selected") + @ApiOperation("閫夋嫨璐ㄦ鍗曟嵁") + @PreAuthorize("hasAuthority('manager:qlyInspect:update')") + public R selectedOrder(@RequestBody IsptOrderParam param) { + if (Objects.isNull(param)) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + Long loginUserId = getLoginUserId(); + return qlyInspectService.saveSelected(param, loginUserId); + } + @PreAuthorize("hasAuthority('manager:qlyInspect:list')") @PostMapping("/qlyInspect/list") public R list(@RequestBody Map<String, Object> map) { @@ -81,10 +106,8 @@ @PostMapping("/qlyInspect/save") public R save(@RequestBody QlyInspect qlyInspect) { qlyInspect.setCreateBy(getLoginUserId()); - qlyInspect.setCreateTime(new Date()); qlyInspect.setUpdateBy(getLoginUserId()); - qlyInspect.setUpdateTime(new Date()); - if (!qlyInspectService.save(qlyInspect)) { + if (!qlyInspectService.qlySave(qlyInspect)) { return R.error("Save Fail"); } return R.ok("Save Success").add(qlyInspect); @@ -106,6 +129,13 @@ @OperationLog("Delete 璐ㄦ淇℃伅") @PostMapping("/qlyInspect/remove/{ids}") public R remove(@PathVariable Long[] ids) { + if (Objects.isNull(ids) || ids.length < 1) { + return R.error("鑳芥暟涓嶈兘涓虹┖锛侊紒"); + } + List<QlyInspect> qlyInspects = qlyInspectService.list(new LambdaQueryWrapper<QlyInspect>().in(QlyInspect::getId, ids)); + if (!qlyInspects.isEmpty()) { + return R.error("鏈夋槑缁嗗垪琛ㄥ瓨鍦紒锛�"); + } if (!qlyInspectService.removeByIds(Arrays.asList(ids))) { return R.error("Delete Fail"); } -- Gitblit v1.9.1