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/api/controller/pda/PdaOutStockController.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
index fcfcc15..6ff9602 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
@@ -29,7 +29,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -125,7 +125,7 @@
Page<WkOrder> page = new Page<>(curr, limit);
LambdaQueryWrapper<WkOrder> wkOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
- wkOrderLambdaQueryWrapper.eq(WkOrder::getType, OrderType.ORDER_OUT.type);
+// wkOrderLambdaQueryWrapper.eq(WkOrder::getType, OrderType.ORDER_OUT.type);
wkOrderLambdaQueryWrapper.eq(WkOrder::getWkType, orderType);
wkOrderLambdaQueryWrapper.eq(!Cools.isEmpty(orderNo), WkOrder::getCode, orderNo);
Page<WkOrder> wkOrderPage = outStockService.page(page, wkOrderLambdaQueryWrapper);
@@ -206,18 +206,29 @@
return pdaOutStockService.containerRebinding(param,getLoginUserId());
}
- @PostMapping("/orderOut/buffStore/callEmpty")
- @ApiOperation("鐏屾《鍏ュ簱鍛煎彨绌烘《")
- public R buffStoreCallEmpty(@RequestBody PdaGeneralParam param) {
- param.getSta1();
- return R.ok();
+ @PostMapping("/orderOut/getOrderItem")
+ @ApiOperation("鐏屾《鍏ュ簱鍛煎彨鏂版枡")
+ public R getOrderItem(@RequestBody PdaGeneralParam param) {
+ return pdaOutStockService.getOrderItem(param);
}
- @PostMapping("/orderOut/buffStore/callNewMat")
+ @PostMapping("/orderOut/getStationArea")
@ApiOperation("鐏屾《鍏ュ簱鍛煎彨鏂版枡")
- public R buffStoreCallNewMat(@RequestBody PdaGeneralParam param) {
- param.getSta2();
- return R.ok();
+ public R getStationArea(@RequestBody PdaGeneralParam param) {
+ return pdaOutStockService.getStationArea(param);
+ }
+
+ @PostMapping("/orderOut/productionDirectDelivery")
+ @ApiOperation("鐢熶骇鐩撮��")
+ public R productionDirectDelivery(@RequestBody PdaGeneralParam param) {
+ return pdaOutStockService.productionDirectDelivery(param,getLoginUserId());
+ }
+
+ @PostMapping("/orderOut/finishedProductDirectOutput")
+ @ApiOperation("鎴愬搧鐩村嚭")
+ public R finishedProductDirectOutput(@RequestBody PdaGeneralParam param) {
+ return pdaOutStockService.finishedProductDirectOutput(param,getLoginUserId());
}
}
+
--
Gitblit v1.9.1