From 2d8654299dc0b74befb98e2e879f224b565e0717 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 11 三月 2026 10:54:21 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 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 89faf4c..785f69b 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
@@ -8,7 +8,9 @@
import com.vincent.rsf.server.api.entity.params.CallForEmptyContainersParam;
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.entity.params.OrderOutGeneralParam;
+import com.vincent.rsf.server.api.entity.params.PdaGeneralParam;
import com.vincent.rsf.server.api.service.PdaOutStockService;
+import com.vincent.rsf.server.manager.controller.params.GenWaveParams;
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.controller.params.OutStockToTaskParams;
import com.vincent.rsf.server.manager.entity.Loc;
@@ -123,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);
@@ -157,7 +159,7 @@
return outStockService.getOrderOutTaskItem(orderOutTaskParam,param.getOrderItemId());
}
- //
+ //q
@PostMapping("/orderOut/getOutLocRun")
public R orderOutGetOutLocRun(@RequestBody OrderOutGeneralParam param) {
LocItem locItem = locItemService.getById(param.getItemId());
@@ -175,9 +177,47 @@
List<OutStockToTaskParams> tasks = new ArrayList<>();
OutStockToTaskParams outStockToTaskParams = new OutStockToTaskParams(orderItem);
outStockToTaskParams.setLocCode(loc.getCode());
- outStockToTaskParams.setSiteNo(param.getOutSta().toString());
+ outStockToTaskParams.setId(locItem.getId());
+ outStockToTaskParams.setBarcode(loc.getBarcode());
+ outStockToTaskParams.setSiteNo(param.getOutSta());
+ outStockToTaskParams.setOutQty(param.getOutQty());
tasks.add(outStockToTaskParams);
return outStockService.genOutStockTask(tasks,getLoginUserId(), orderItem.getOrderId());
}
+
+ //q
+ @PostMapping("/orderOut/all/in")//娉㈡鏁存墭鍑哄簱
+ public R orderOutGetOutLocRunAllIn(@RequestBody GenWaveParams params) {
+// GenWaveParams genWaveParams = new GenWaveParams();
+ return outStockService.generateWaves(params);
+
+ }
+
+ @PostMapping("/orderOut/taskItemList")
+ @ApiOperation("澶囪揣瀹瑰櫒椤甸潰鏌ヨ浠诲姟鏄庣粏")
+ public R taskItemList(@RequestBody PdaGeneralParam param) {
+ return pdaOutStockService.taskItemList(param,getLoginUserId());
+ }
+
+ @PostMapping("/orderOut/containerRebinding")
+ @ApiOperation("澶囪揣瀹瑰櫒鎹㈢粦")
+ public R containerRebinding(@RequestBody PdaGeneralParam param) {
+ return pdaOutStockService.containerRebinding(param,getLoginUserId());
+ }
+
+ @PostMapping("/orderOut/buffStore/callEmpty")
+ @ApiOperation("鐏屾《鍏ュ簱鍛煎彨绌烘《")
+ public R buffStoreCallEmpty(@RequestBody PdaGeneralParam param) {
+ param.getSta1();
+ return R.ok();
+ }
+
+ @PostMapping("/orderOut/buffStore/callNewMat")
+ @ApiOperation("鐏屾《鍏ュ簱鍛煎彨鏂版枡")
+ public R buffStoreCallNewMat(@RequestBody PdaGeneralParam param) {
+ param.getSta2();
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1