From 2f8e173048d22c5b40612c3538b9c1aa5a5397f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 27 三月 2026 13:38:05 +0800
Subject: [PATCH] #乐观锁
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 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 8ed1ab3..d22eb63 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,11 @@
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.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 +37,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 +52,8 @@
private PurchaseServiceImpl purchaseService;
@Autowired
private PurchaseItemServiceImpl purchaseItemService;
+ @Autowired
+ private DictDataServiceImpl dictDataService;
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrder/page")
@@ -64,7 +70,7 @@
@PostMapping("/asnOrder/dashbord/header")
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
public R getDashbord() {
- return R.ok().add(asnOrderService.getDashbord());
+ return asnOrderService.getDashbord();
}
@ApiOperation("鑾峰彇鍑哄叆搴撹秼鍔垮浘")
@@ -94,6 +100,31 @@
return R.ok().add(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(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(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(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(dictData);
+ }
+
+
@PreAuthorize("hasAuthority('manager:asnOrder:save')")
@OperationLog("Create ASN鍗曟嵁")
@PostMapping("/asnOrder/save")
@@ -116,6 +147,7 @@
@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)) {
--
Gitblit v1.9.1