From f1475b4e49734c821560a41fa42b504bac2c8887 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 21 一月 2026 14:53:21 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java | 1 +
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 25 +++++++++++++++++--------
2 files changed, 18 insertions(+), 8 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 4fcca4a..c7921b3 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
@@ -9,6 +9,7 @@
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.entity.params.OrderOutGeneralParam;
import com.vincent.rsf.server.api.service.PdaOutStockService;
+import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.enums.OrderType;
@@ -135,16 +136,24 @@
@PostMapping("/orderOut/getOutLocView")
public R orderOutGetOutLocView(@RequestBody OrderOutGeneralParam param) {
- // 鍙傛暟 param.getOrderItemId()//鍑哄簱棰勮
+ //鍙傛暟 param.getOrderItemId()//鍑哄簱棰勮
+ if (Cools.isEmpty(param)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ OrderOutTaskParam orderOutTaskParam = new OrderOutTaskParam();
+ orderOutTaskParam.setOrderId(param.getOrderItemId());
+ orderOutTaskParam.setWaveId(param.getWaveId());
+
+ return outStockService.getOrderOutTaskItem(orderOutTaskParam);
+
+// return R.ok();
+ }
+ //
+ @PostMapping("/orderOut/getOutLocRun")
+ public R orderOutGetOutLocRun(@RequestBody OrderOutGeneralParam param) {
+ //鍙傛暟 param.getOrderItemId()//鍑哄簱鎵ц
return R.ok();
}
- //
- // @PostMapping("/orderOut/getOutLocRun")
- // public R orderOutGetOutLocView(@RequestBody OrderOutGeneralParam param) {
- // //鍙傛暟 param.getOrderItemId()//鍑哄簱鎵ц
- //
- // return R.ok();
- // }
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java
index 5d39eab..e01066d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java
@@ -12,6 +12,7 @@
private Long orderItemId;//璁㈠崟鏄庣粏ID
private Long waveId = 16L;//鍑哄簱绛栫暐
+ private List<Detl> detlList;
class Detl{
private String loc_no;
private String matnr;
--
Gitblit v1.9.1