From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
index 941cabb..6a63ed9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
@@ -11,10 +11,8 @@
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.controller.params.AsnOrderAndItemsParams;
-import com.vincent.rsf.server.manager.controller.params.CheckOrderItemParams;
-import com.vincent.rsf.server.manager.controller.params.CheckOrderParams;
-import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
+import com.vincent.rsf.server.common.utils.OptimisticLockUtils;
+import com.vincent.rsf.server.manager.controller.params.*;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
@@ -22,6 +20,7 @@
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.service.CheckOrderService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
@@ -31,7 +30,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
@@ -49,25 +48,26 @@
PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
QueryWrapper<WkOrder> wrapper = pageParam.buildWrapper(true);
wrapper.eq("type", OrderType.ORDER_CHECK.type);
- return R.ok().add(checkOrderService.page(pageParam, wrapper));
+ PageParam<WkOrder, BaseParam> page = checkOrderService.page(pageParam, wrapper);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping("/check/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(checkOrderService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(checkOrderService.list()));
}
@PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping({"/check/many/{ids}", "/check/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(checkOrderService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(checkOrderService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:check:list')")
@GetMapping("/check/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(checkOrderService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(checkOrderService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:check:save')")
@@ -82,19 +82,20 @@
if (!checkOrderService.save(order)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(order);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(order));
}
@PreAuthorize("hasAuthority('manager:check:update')")
@OperationLog("Update 瀛楀吀鏁版嵁闆�")
@PostMapping("/check/update")
public R update(@RequestBody WkOrder order) {
+ OptimisticLockUtils.requireVersion("鐩樼偣鍗�", order.getVersion());
order.setUpdateTime(null);
order.setUpdateBy(getLoginUserId());
if (!checkOrderService.updateById(order)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(order);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(order));
}
@PreAuthorize("hasAuthority('manager:check:remove')")
@@ -116,7 +117,7 @@
if (!checkOrderService.removeByIds(orderIds)) {
return R.error("Delete Fail");
}
- return R.ok("Delete Success").add(ids);
+ return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
}
@PreAuthorize("hasAuthority('manager:outStock:update')")
@@ -140,7 +141,7 @@
checkOrderService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getCode()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
@PreAuthorize("hasAuthority('manager:check:list')")
@@ -152,7 +153,7 @@
} else {
orders = checkOrderService.list();
}
- ExcelUtil.build(ExcelUtil.create(orders, WkOrder.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(orders), WkOrder.class), response);
}
@PostMapping("/check/items/save")
@@ -215,13 +216,13 @@
@ApiOperation("鑾峰彇鍦ㄥ簱鐗╂枡鍒楄〃")
- @PostMapping("/check/locs/{matnrs}")
+ @PostMapping("/check/locs")
@PreAuthorize("hasAuthority('manager:check:list')")
- public R getAllLocByMatnr(@PathVariable String[] matnrs) {
- if (Objects.isNull(matnrs)) {
+ public R getAllLocByMatnr(@RequestBody CheckLocQueryParams params) {
+ if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return checkOrderService.getAllLocByMatnr(Arrays.asList(matnrs));
+ return checkOrderService.getAllLocByMatnr(params);
}
--
Gitblit v1.9.1