From ccc07c8fd9164a3d9195f42ba7fc7131f6c8324e Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 28 一月 2026 15:44:59 +0800
Subject: [PATCH] #订单预览
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 28 ++++++++++++++++++++--------
1 files changed, 20 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..d47a8cb 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,9 +9,11 @@
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;
+import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.OutStockItemService;
import com.vincent.rsf.server.manager.service.OutStockService;
import com.vincent.rsf.server.system.constant.DictTypeCode;
@@ -41,6 +43,8 @@
private OutStockItemService outStockItemService;
@Autowired
private DictDataService dictDataService;
+ @Autowired
+ private AsnOrderItemService asnOrderItemService;
@GetMapping("/outStockTaskItem/{barcode}")
@ApiOperation("蹇�熸嫞璐ф煡璇�")
@@ -107,12 +111,14 @@
@RequestMapping(value = "/orderOut/list")
public R pdaPageList(@RequestParam(required = true) String orderNo,
+ @RequestParam(required = true) String orderType,
@RequestParam(defaultValue = "1") Integer curr,
@RequestParam(defaultValue = "5") Integer limit) {
Page<WkOrder> page = new Page<>(curr, limit);
LambdaQueryWrapper<WkOrder> wkOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
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);
return R.ok(wkOrderPage);
@@ -135,16 +141,22 @@
@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,param.getOrderItemId());
+ }
+ //
+ @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();
- // }
}
--
Gitblit v1.9.1