From c46d1d8c3b9875f051a6ec3c4a1d3fa7bd32e5db Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 15 五月 2025 17:15:21 +0800
Subject: [PATCH] 新增库存管理 新增库存明细
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 6e6a8f9..dcff993 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
@@ -13,12 +13,15 @@
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.entity.QlyIsptItem;
import com.vincent.rsf.server.manager.service.QlyInspectService;
+import com.vincent.rsf.server.manager.service.QlyIsptItemService;
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 lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -27,12 +30,15 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+@Slf4j
@Api(tags = "璐ㄦ淇℃伅")
@RestController
public class QlyInspectController extends BaseController {
@Autowired
private QlyInspectService qlyInspectService;
+ @Autowired
+ private QlyIsptItemService qlyIsptItemService;
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
@PostMapping("/qlyInspect/page")
@@ -53,7 +59,7 @@
}
@PostMapping("/qlyInspect/reports")
- @ApiOperation("鑾峰彇宸蹭笂鎶ュ崟鎹槑缁�")
+ @ApiOperation("鑾峰彇鍙川妫�鍗曟嵁鏄庣粏")
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
public R listByAsnCode(@RequestBody Map<String, Object> map) {
if (Objects.isNull(map)) {
@@ -114,6 +120,16 @@
}
@PreAuthorize("hasAuthority('manager:qlyInspect:update')")
+ @ApiOperation("瀹℃牳纭")
+ @PostMapping("/qlyInspect/verify/complate/{id}")
+ public R verifyComplate(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return qlyInspectService.verifyComplate(id);
+ }
+
+ @PreAuthorize("hasAuthority('manager:qlyInspect:update')")
@OperationLog("Update 璐ㄦ淇℃伅")
@PostMapping("/qlyInspect/update")
public R update(@RequestBody QlyInspect qlyInspect) {
@@ -132,12 +148,19 @@
if (Objects.isNull(ids) || ids.length < 1) {
return R.error("鑳芥暟涓嶈兘涓虹┖锛侊紒");
}
- List<QlyInspect> qlyInspects = qlyInspectService.list(new LambdaQueryWrapper<QlyInspect>().in(QlyInspect::getId, ids));
+ List<QlyInspect> qlyInspects = qlyInspectService.list(new LambdaQueryWrapper<QlyInspect>()
+ .in(QlyInspect::getId, ids)
+ .gt(QlyInspect::getIsptQty, 0)
+ );
if (!qlyInspects.isEmpty()) {
- return R.error("鏈夋槑缁嗗垪琛ㄥ瓨鍦紒锛�");
+ return R.error("鏈夋槑缁嗗崟鎹凡鍦ㄨ川妫�涓紒锛�");
}
if (!qlyInspectService.removeByIds(Arrays.asList(ids))) {
- return R.error("Delete Fail");
+ return R.error("涓诲崟鍒犻櫎澶辫触锛侊紒");
+ }
+
+ if (!qlyIsptItemService.remove(new LambdaQueryWrapper<QlyIsptItem>().in(QlyIsptItem::getIspectId, ids))) {
+ return R.error("鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
return R.ok("Delete Success").add(ids);
}
--
Gitblit v1.9.1