From 9e2eb64f6f9cf3f0921818e773f52e8e41b1ad88 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期四, 02 四月 2026 15:42:54 +0800
Subject: [PATCH] 实现多订单组托，并且在pda上区分配盘和来料入库单
---
src/main/java/com/zy/asrs/controller/MobileController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 7085b61..8c34cf5 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -648,8 +648,16 @@
}
@RequestMapping("/orderIn")
- public synchronized R AGVOrderInReturn() {
- List<OrderPakin> settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2));
+ public synchronized R AGVOrderInReturn(@RequestBody JSONObject param) {
+ List<OrderPakin> settle;
+ if(param.getString("type").equals("1")){
+ settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2).eq("doc_type",1));
+ }else if(param.getString("type").equals("2")){
+ settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2).eq("doc_type",2));
+ }
+ else {
+ settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2));
+ }
List<String> list = new ArrayList<>();
for (OrderPakin orderPakin : settle) {
if (orderPakin.getSettle()==2){
--
Gitblit v1.9.1