From 9542df75702c17ecc976b5a7a71f78cc9be85e4d Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 21 一月 2026 14:50:58 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java | 8 +++++++-
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 23 ++++++++++++++++-------
2 files changed, 23 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 2f42b08..fc5c671 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;
@@ -142,16 +143,24 @@
@PostMapping("/orderOut/getOutLocView")
public R orderOutGetOutLocView(@RequestBody OrderOutGeneralParam param) {
//鍙傛暟 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 4e6ae09..5d39eab 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
@@ -10,7 +10,13 @@
private List<Long> type;
- private Long orderItemId;
+ private Long orderItemId;//璁㈠崟鏄庣粏ID
+ private Long waveId = 16L;//鍑哄簱绛栫暐
+ class Detl{
+ private String loc_no;
+ private String matnr;
+ private Double anfme;
+ }
}
--
Gitblit v1.9.1