From d329d3764120f1caa5932f69654248331604a890 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 七月 2025 09:59:01 +0800
Subject: [PATCH] 盘点功能代码优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java | 49 +++++++------------------------------------------
1 files changed, 7 insertions(+), 42 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
index dc74d9c..76683cd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
@@ -10,8 +10,7 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
-import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
import com.vincent.rsf.server.manager.service.CheckOrderItemService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -43,8 +42,8 @@
@PostMapping("/checkItem/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
- QueryWrapper<AsnOrderItem> wrapper = pageParam.buildWrapper(true);
+ PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
+ QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true);
return R.ok().add(checkOrderItemService.page(pageParam, wrapper));
}
@@ -69,7 +68,7 @@
@PreAuthorize("hasAuthority('manager:check:save')")
@OperationLog("Create 瀛楀吀鏁版嵁闆�")
@PostMapping("/checkItem/save")
- public R save(@RequestBody AsnOrderItem order) {
+ public R save(@RequestBody WkOrderItem order) {
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_CHECK_RULE_CODE, order);
if (Objects.isNull(ruleCode)) {
throw new RuntimeException("鐩樼偣鍗曞彿鐢熸垚澶辫触锛侊紒");
@@ -83,7 +82,7 @@
@PreAuthorize("hasAuthority('manager:check:update')")
@OperationLog("Update 瀛楀吀鏁版嵁闆�")
@PostMapping("/checkItem/update")
- public R update(@RequestBody AsnOrderItem order) {
+ public R update(@RequestBody WkOrderItem order) {
order.setUpdateTime(null);
order.setUpdateBy(getLoginUserId());
if (!checkOrderItemService.updateById(order)) {
@@ -106,48 +105,14 @@
@PostMapping("/checkItem/query")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
- LambdaQueryWrapper<AsnOrderItem> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<WkOrderItem> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(AsnOrderItem::getAsnCode, condition);
+ wrapper.like(WkOrderItem::getAsnCode, condition);
}
checkOrderItemService.page(new Page<>(1, 20), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getAsnCode()))
);
return R.ok().add(vos);
- }
-
- /**
- * @author Ryan
- * @date 2025/7/14
- * @description: 鐩樼偣鍗曞鍑�
- * @version 1.0
- */
- @PreAuthorize("hasAuthority('manager:check:list')")
- @PostMapping("/checkItem/export")
- public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- List<AsnOrderItem> orders = new ArrayList<>();
- if (!Objects.isNull(map.get("ids"))) {
- orders = checkOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getId, map.get("ids")));
- } else {
- orders = checkOrderItemService.list();
- }
- ExcelUtil.build(ExcelUtil.create(orders, AsnOrderItem.class), response);
- }
-
- /**
- * @author Ryan
- * @description 涓嬭浇妯℃澘
- * @param
- * @return
- * @time 2025/4/18 08:17
- */
- @PostMapping("/checkItem/template/download")
- @ApiOperation("涓嬭浇鐩樼偣鍗曟ā鏉�")
- @PreAuthorize("hasAuthority('manager:check:update')")
- public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- CheckOrderTemplate template = ExcelUtil.mockData(CheckOrderTemplate.class);
- List<CheckOrderTemplate> list = Arrays.asList(template);
- ExcelUtil.build(ExcelUtil.create(list, CheckOrderTemplate.class, true), response);
}
}
--
Gitblit v1.9.1