From 256c59555e2a5dffdd6d127a519d4f0944b80e7f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 14 五月 2025 16:29:38 +0800
Subject: [PATCH] #物料表动态字段搜索
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java | 91 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 85 insertions(+), 6 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 a86a91b..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
@@ -4,14 +4,25 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
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.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;
import org.springframework.web.bind.annotation.*;
@@ -19,11 +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")
@@ -31,6 +46,47 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<QlyInspect, BaseParam> pageParam = new PageParam<>(baseParam, QlyInspect.class);
return R.ok().add(qlyInspectService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PostMapping("/qlyInspect/all/save")
+ @PreAuthorize("'manager:qlyInspect:save'")
+ @ApiOperation("鍗曟嵁鍙婃槑缁嗕繚瀛�")
+ public R allSvae(@RequestBody QlyInspectAndItem params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok(qlyInspectService.allSave(params));
+ }
+
+ @PostMapping("/qlyInspect/reports")
+ @ApiOperation("鑾峰彇鍙川妫�鍗曟嵁鏄庣粏")
+ @PreAuthorize("hasAuthority('manager:qlyInspect:list')")
+ public R listByAsnCode(@RequestBody Map<String, Object> map) {
+ if (Objects.isNull(map)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok(qlyInspectService.listByAsn(map));
+ }
+
+ @PostMapping("/qlyInspect/asn/list")
+ @ApiOperation("鑾峰彇寰呰川妫�鍗�")
+ @PreAuthorize("hasAuthority('manager:qlyInspect:list')")
+ public R getUnInspect(@RequestBody Map<String, String> 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')")
@@ -56,13 +112,21 @@
@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);
+ }
+
+ @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')")
@@ -81,8 +145,22 @@
@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)
+ .gt(QlyInspect::getIsptQty, 0)
+ );
+ if (!qlyInspects.isEmpty()) {
+ 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);
}
@@ -93,10 +171,10 @@
List<KeyValVo> vos = new ArrayList<>();
LambdaQueryWrapper<QlyInspect> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(QlyInspect::getName, condition);
+ wrapper.like(QlyInspect::getCode, condition);
}
qlyInspectService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ item -> vos.add(new KeyValVo(item.getId(), item.getCode()))
);
return R.ok().add(vos);
}
@@ -107,4 +185,5 @@
ExcelUtil.build(ExcelUtil.create(qlyInspectService.list(), QlyInspect.class), response);
}
+
}
--
Gitblit v1.9.1