From ffa9b04fbb25726c77458da5607c1b43bdd62603 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 七月 2025 08:25:46 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 48 +++++++++++++++++++++---------------------------
1 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
index 24fc8af..99b86d6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -7,9 +7,7 @@
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.manager.entity.Purchase;
-import com.vincent.rsf.server.manager.entity.PurchaseItem;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.utils.ExcelUtil;
@@ -19,11 +17,8 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
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.enums.POExceStatus;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.service.impl.PurchaseItemServiceImpl;
@@ -40,7 +35,6 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
-import java.util.stream.Collectors;
@RestController
@Api(tags = "ASN鍏ュ簱閫氱煡鍗�")
@@ -59,8 +53,8 @@
@PostMapping("/asnOrder/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<AsnOrder, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrder.class);
- QueryWrapper<AsnOrder> queryWrapper = pageParam.buildWrapper(true);
+ PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
+ QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
List<String> asList = Arrays.asList(OrderType.ORDER_IN.type);
queryWrapper.in("type", asList);
return R.ok().add(asnOrderService.page(pageParam, queryWrapper));
@@ -89,30 +83,30 @@
@OperationLog("Create ASN鍗曟嵁")
@PostMapping("/asnOrder/save")
@ApiOperation("淇濆瓨")
- public R save(@RequestBody AsnOrder asnOrder) {
- asnOrder.setCreateBy(getLoginUserId());
- asnOrder.setUpdateBy(getLoginUserId());
- String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, asnOrder);
+ public R save(@RequestBody WkOrder wkOrder) {
+ wkOrder.setCreateBy(getLoginUserId());
+ wkOrder.setUpdateBy(getLoginUserId());
+ String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, wkOrder);
if (!Objects.isNull(code)) {
- asnOrder.setCode(code);
+ wkOrder.setCode(code);
}
- if (!asnOrderService.save(asnOrder)) {
+ if (!asnOrderService.save(wkOrder)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(asnOrder);
+ return R.ok("Save Success").add(wkOrder);
}
@PreAuthorize("hasAuthority('manager:asnOrder:update')")
@OperationLog("Update ASN鍗曟嵁")
@PostMapping("/asnOrder/update")
@ApiOperation("鏇存柊")
- public R update(@RequestBody AsnOrder asnOrder) {
- asnOrder.setUpdateBy(getLoginUserId());
- asnOrder.setUpdateTime(new Date());
- if (!asnOrderService.updateById(asnOrder)) {
+ public R update(@RequestBody WkOrder wkOrder) {
+ wkOrder.setUpdateBy(getLoginUserId());
+ wkOrder.setUpdateTime(new Date());
+ if (!asnOrderService.updateById(wkOrder)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(asnOrder);
+ return R.ok("Update Success").add(wkOrder);
}
@PreAuthorize("hasAuthority('manager:asnOrder:remove')")
@@ -131,9 +125,9 @@
@ApiOperation("鏌ヨ")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
- LambdaQueryWrapper<AsnOrder> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<WkOrder> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(AsnOrder::getCode, condition);
+ wrapper.like(WkOrder::getCode, condition);
}
asnOrderService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getCode()))
@@ -145,11 +139,11 @@
@PostMapping("/asnOrder/export")
@ApiOperation("瀵煎嚭")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- List<AsnOrder> orders = new ArrayList<>();
+ List<WkOrder> orders = new ArrayList<>();
if (!Objects.isNull(map.get("ids"))) {
List<Long> ids = JSONArray.parseArray(JSONObject.toJSONString(map.get("ids")), Long.class);
if (!ids.isEmpty()) {
- orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, ids));
+ orders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, ids));
} else {
orders = asnOrderService.list(new LambdaQueryWrapper<>());
}
@@ -157,7 +151,7 @@
orders = asnOrderService.list();
}
List<AsnOrderTemplate> orderTemplates = new ArrayList<>();
- for (AsnOrder order : orders) {
+ for (WkOrder order : orders) {
List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
for (AsnOrderItem item : orderItems) {
if (Objects.isNull(item)) {
@@ -191,7 +185,7 @@
@PostMapping("/asnOrder/inspect")
@ApiOperation("璐ㄦ涓婃姤")
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
- public R notifyInspect(@RequestBody List<AsnOrder> orders) {
+ public R notifyInspect(@RequestBody List<WkOrder> orders) {
if (orders.isEmpty()) {
return R.error("涓婃姤鍗曟嵁涓嶈兘涓虹┖!!");
}
--
Gitblit v1.9.1