From a488088a18a9b8808bc57124681cee8c4ada7299 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 10 三月 2026 17:23:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 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 7d2c52b..fcfcc15 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
@@ -10,6 +10,7 @@
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;
@@ -184,6 +185,15 @@
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) {
@@ -196,4 +206,18 @@
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