From a8df4c4a80781c02815021a840971ce4b15419f5 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 09:38:24 +0800
Subject: [PATCH] refactor: batch fill page operator names
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
index 833bb08..1abb184 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
@@ -14,6 +14,7 @@
import com.vincent.rsf.server.manager.controller.params.OutStockToTaskParams;
import com.vincent.rsf.server.manager.entity.DeliveryItem;
import com.vincent.rsf.server.manager.entity.WkOrder;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.annotation.OperationLog;
@@ -21,13 +22,14 @@
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.common.utils.OptimisticLockUtils;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.service.OutStockItemService;
import com.vincent.rsf.server.manager.service.OutStockService;
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;
@@ -39,7 +41,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
@@ -58,9 +60,11 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
- List<String> list = Arrays.asList(OrderType.ORDER_OUT.type);
- queryWrapper.in("type", list);
- return R.ok().add(outStockService.page(pageParam, queryWrapper));
+// List<String> list = Arrays.asList(OrderType.ORDER_OUT.type);
+// queryWrapper.in("type", list);
+ PageParam<WkOrder, BaseParam> page = outStockService.page(pageParam, queryWrapper);
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:outStock:list')")
@@ -71,7 +75,9 @@
QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
List<String> list = Arrays.asList(OrderType.ORDER_OUT.type);
queryWrapper.in("type", list);
- return R.ok().add(outStockService.page(pageParam, queryWrapper));
+ PageParam<WkOrder, BaseParam> page = outStockService.page(pageParam, queryWrapper);
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:outStock:list')")
@@ -119,6 +125,7 @@
@PostMapping("/outStock/update")
@ApiOperation("鏇存柊")
public R update(@RequestBody WkOrder wkOrder) {
+ OptimisticLockUtils.requireVersion("鍑哄簱鍗�", wkOrder.getVersion());
wkOrder.setType(OrderType.ORDER_OUT.type)
.setUpdateBy(getLoginUserId())
.setUpdateTime(new Date());
@@ -175,7 +182,7 @@
if (list.isEmpty()) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- List<AsnOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getId, list));
+ List<WkOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getId, list));
if (orderItems.isEmpty()) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -200,8 +207,8 @@
}
List<AsnOrderTemplate> orderTemplates = new ArrayList<>();
for (WkOrder order : orders) {
- List<AsnOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
- for (AsnOrderItem item : orderItems) {
+ List<WkOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
+ for (WkOrderItem item : orderItems) {
if (Objects.isNull(item)) {
continue;
}
@@ -256,6 +263,17 @@
return outStockService.saveOutStock(params, getLoginUserId());
}
+ @GetMapping("/outStock/complete/{id}")
+ @ApiOperation("瀹屾垚鍑哄簱鍗�")
+ @PreAuthorize("hasAuthority('manager:outStock:update')")
+ public R complete(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return outStockService.completeOutOrderById(id);
+ }
+
+
@ApiOperation("鍗曟嵁淇℃伅淇敼")
@PostMapping("/outStock/items/update")
@PreAuthorize("hasAuthority('manager:outStock:update')")
--
Gitblit v1.9.1