From 2dbe2c8b830a3b006b1536c7dac48b5f8c24e00d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 28 四月 2025 16:53:07 +0800
Subject: [PATCH] #wms端生成任务优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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 f1a1117..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
@@ -14,9 +14,12 @@
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.*;
@@ -59,23 +62,26 @@
return R.ok(qlyInspectService.listByAsn(map));
}
- @GetMapping("/qlyInspect/asn/list")
+ @PostMapping("/qlyInspect/asn/list")
@ApiOperation("鑾峰彇寰呰川妫�鍗�")
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
- public R getUnInspect() {
- return R.ok(qlyInspectService.getUnInspect());
+ public R getUnInspect(@RequestBody Map<String, Object> map) {
+ if (Objects.isNull(map)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok(qlyInspectService.getUnInspect(map));
}
- @PostMapping("/qlyInspect/reports")
+ @PostMapping("/qlyInspect/selected")
@ApiOperation("閫夋嫨璐ㄦ鍗曟嵁")
@PreAuthorize("hasAuthority('manager:qlyInspect:update')")
- public R selectedOrder(IsptOrderParam param) {
+ public R selectedOrder(@RequestBody IsptOrderParam param) {
if (Objects.isNull(param)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return qlyInspectService.saveSelected(param);
+ Long loginUserId = getLoginUserId();
+ return qlyInspectService.saveSelected(param, loginUserId);
}
-
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
@PostMapping("/qlyInspect/list")
@@ -100,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);
@@ -125,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