From 691bee4229856f8bf81c2720092ecee1c9f21509 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 19:18:12 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java | 70 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
index 6d21210..5bf0e45 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
@@ -16,6 +16,7 @@
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.common.utils.OptimisticLockUtils;
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.excel.AsnOrderTemplate;
@@ -23,8 +24,12 @@
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.service.impl.PurchaseItemServiceImpl;
import com.vincent.rsf.server.manager.service.impl.PurchaseServiceImpl;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
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.entity.DictData;
+import com.vincent.rsf.server.system.service.impl.DictDataServiceImpl;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -33,7 +38,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
@@ -48,6 +53,8 @@
private PurchaseServiceImpl purchaseService;
@Autowired
private PurchaseItemServiceImpl purchaseItemService;
+ @Autowired
+ private DictDataServiceImpl dictDataService;
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrder/page")
@@ -57,27 +64,69 @@
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));
+// pageParam.setSearchCount(false);
+ PageParam<WkOrder, BaseParam> page = asnOrderService.page(pageParam, queryWrapper);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
+
+ @ApiOperation("鑾峰彇棣栭〉琛ㄥご鏁版嵁")
+ @PostMapping("/asnOrder/dashbord/header")
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ public R getDashbord() {
+ return asnOrderService.getDashbord();
+ }
+
+ @ApiOperation("鑾峰彇鍑哄叆搴撹秼鍔垮浘")
+ @PostMapping("/asnOrder/stock/trand")
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ public R getStockTrand() {
+ return R.ok().add(buildPageRowsUtils.rowsMap(asnOrderService.getStockTrand()));
+ }
+
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrder/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(asnOrderService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(asnOrderService.list()));
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping({"/asnOrder/many/{ids}", "/asnOrders/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(asnOrderService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(asnOrderService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@OperationLog("琛ㄥ崟鏌ヨ")
@GetMapping("/asnOrder/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(asnOrderService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(asnOrderService.getById(id)));
}
+
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ @OperationLog("琛ㄥ崟鏌ヨ")
+ @GetMapping("/asnOrder/wrkType/{id}")
+ public R getWrkType(@PathVariable("id") String value) {
+// WkOrder byId = asnOrderService.getById(id);
+// if (Cools.isEmpty(byId)) {
+// return R.ok().add(buildPageRowsUtils.rowsMap(new DictData()));
+// }
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE).eq(DictData::getValue, value));
+ return R.ok().add(buildPageRowsUtils.rowsMap(dictData));
+ }
+
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ @OperationLog("琛ㄥ崟鏌ヨ")
+ @GetMapping("/asnOrder/orderType/{id}")
+ public R getOrderType(@PathVariable("id") String value) {
+// WkOrder byId = asnOrderService.getById(id);
+// if (Cools.isEmpty(byId)) {
+// return R.ok().add(buildPageRowsUtils.rowsMap(new DictData()));
+// }
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE).eq(DictData::getValue, value));
+ return R.ok().add(buildPageRowsUtils.rowsMap(dictData));
+ }
+
@PreAuthorize("hasAuthority('manager:asnOrder:save')")
@OperationLog("Create ASN鍗曟嵁")
@@ -93,7 +142,7 @@
if (!asnOrderService.save(wkOrder)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(wkOrder);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(wkOrder));
}
@PreAuthorize("hasAuthority('manager:asnOrder:update')")
@@ -101,12 +150,13 @@
@PostMapping("/asnOrder/update")
@ApiOperation("鏇存柊")
public R update(@RequestBody WkOrder wkOrder) {
+ OptimisticLockUtils.requireVersion("ASN鍗曟嵁", wkOrder.getVersion());
wkOrder.setUpdateBy(getLoginUserId());
wkOrder.setUpdateTime(new Date());
if (!asnOrderService.updateById(wkOrder)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(wkOrder);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(wkOrder));
}
@PreAuthorize("hasAuthority('manager:asnOrder:remove')")
@@ -132,7 +182,7 @@
asnOrderService.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:asnOrder:list')")
@@ -152,7 +202,7 @@
}
List<AsnOrderTemplate> orderTemplates = new ArrayList<>();
for (WkOrder order : orders) {
- List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, order.getId()));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
for (WkOrderItem item : orderItems) {
if (Objects.isNull(item)) {
continue;
@@ -173,7 +223,7 @@
orderTemplates.add(template);
}
}
- ExcelUtil.build(ExcelUtil.create(orderTemplates, AsnOrderTemplate.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(orderTemplates), AsnOrderTemplate.class), response);
}
/**
--
Gitblit v1.9.1