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/service/impl/PdaOtherServiceImpl.java     |   29 ++++++++++++++
 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOtherController.java    |   33 ++++++++++++++++
 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java |    2 +
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOtherService.java              |    7 +++
 4 files changed, 71 insertions(+), 0 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOtherController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOtherController.java
new file mode 100644
index 0000000..b713eaf
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOtherController.java
@@ -0,0 +1,33 @@
+package com.vincent.rsf.server.api.controller.pda;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.api.service.PdaOtherService;
+import com.vincent.rsf.server.manager.entity.WkOrder;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "PDA缁煎悎鎿嶄綔鎺ュ彛")
+@RequestMapping("/pda")
+@RestController
+public class PdaOtherController extends BaseController {
+
+    @Autowired
+    private PdaOtherService pdaOtherService;
+
+
+    @RequestMapping(value = "/other/transferPage")
+    public R transferPage(@RequestParam(required = true) String orderNo,
+                         @RequestParam(defaultValue = "1") Integer curr,
+                         @RequestParam(defaultValue = "5") Integer limit) {
+
+        return pdaOtherService.transferPage(orderNo,curr,limit);
+    }
+}
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 848ddb6..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
@@ -111,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);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOtherService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOtherService.java
new file mode 100644
index 0000000..4d3b7d3
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOtherService.java
@@ -0,0 +1,7 @@
+package com.vincent.rsf.server.api.service;
+
+import com.vincent.rsf.framework.common.R;
+
+public interface PdaOtherService {
+    R transferPage(String orderNo, Integer curr, Integer limit);
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOtherServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOtherServiceImpl.java
new file mode 100644
index 0000000..5794a96
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOtherServiceImpl.java
@@ -0,0 +1,29 @@
+package com.vincent.rsf.server.api.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.api.service.PdaOtherService;
+import com.vincent.rsf.server.manager.entity.Transfer;
+import com.vincent.rsf.server.manager.entity.WkOrder;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.service.TransferService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PdaOtherServiceImpl implements PdaOtherService {
+
+    @Autowired
+    private TransferService transferService;
+
+    @Override
+    public R transferPage(String orderNo, Integer curr, Integer limit) {
+        Page<Transfer> page = new Page<>(curr, limit);
+        LambdaQueryWrapper<Transfer> transferLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        transferLambdaQueryWrapper.eq(!Cools.isEmpty(orderNo), Transfer::getCode, orderNo);
+        Page<Transfer> page1 = transferService.page(page, transferLambdaQueryWrapper);
+        return R.ok(page1);
+    }
+}

--
Gitblit v1.9.1