From f18a3cd65eb57f08ee0def135161054e03f66354 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 10 五月 2025 17:04:49 +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 | 7 +++++--
1 files changed, 5 insertions(+), 2 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 57d0e20..6e6a8f9 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.*;
@@ -62,7 +65,7 @@
@PostMapping("/qlyInspect/asn/list")
@ApiOperation("鑾峰彇寰呰川妫�鍗�")
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
- public R getUnInspect(@RequestBody Map<String, Object> map) {
+ public R getUnInspect(@RequestBody Map<String, String> map) {
if (Objects.isNull(map)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -104,7 +107,7 @@
public R save(@RequestBody QlyInspect qlyInspect) {
qlyInspect.setCreateBy(getLoginUserId());
qlyInspect.setUpdateBy(getLoginUserId());
- if (!qlyInspectService.save(qlyInspect)) {
+ if (!qlyInspectService.qlySave(qlyInspect)) {
return R.error("Save Fail");
}
return R.ok("Save Success").add(qlyInspect);
--
Gitblit v1.9.1