From b14bac5e0de905a6eff0ff65f6b808ff10fddb16 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 12 五月 2025 14:15:38 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java | 9 ++++++---
1 files changed, 6 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 6e6a8f9..a3cfdec 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
@@ -53,7 +53,7 @@
}
@PostMapping("/qlyInspect/reports")
- @ApiOperation("鑾峰彇宸蹭笂鎶ュ崟鎹槑缁�")
+ @ApiOperation("鑾峰彇鍙川妫�鍗曟嵁鏄庣粏")
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
public R listByAsnCode(@RequestBody Map<String, Object> map) {
if (Objects.isNull(map)) {
@@ -132,9 +132,12 @@
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");
--
Gitblit v1.9.1