From d18505cc87fa30a5b202057bbcc4236986efc80a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 11 三月 2026 13:16:55 +0800
Subject: [PATCH] 纽维盛wms初始化-截至现在wms2.0已完善(带数据库)
---
src/main/java/com/zy/asrs/controller/OrderPakinController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakinController.java b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
index e136ea0..ee1c89e 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -45,7 +46,7 @@
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo) {
+ public R navList(@RequestParam(required = false) String orderNo){
EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
@@ -53,7 +54,7 @@
wrapper.le("settle", 2).eq("status", 1);
wrapper.orderBy("create_time", false);
List<OrderPakin> orders = orderService.selectList(wrapper);
- // 淇濈暀鍑哄簱鍗�
+ // 淇濈暀鍏ュ簱鍗�
if (!Cools.isEmpty(orders)) {
Iterator<OrderPakin> iterator = orders.iterator();
while (iterator.hasNext()) {
@@ -61,14 +62,20 @@
if (order.getDocType() != null) {
DocType docType = docTypeService.selectById(order.getDocType());
if (docType != null) {
- if (docType.getPakout() == 0) {
+ if (docType.getPakout() == 1) {
iterator.remove();
}
}
}
}
}
- return R.ok().add(orders);
+ JSONArray jsonArray = new JSONArray();
+ for(OrderPakin orderPakin: orders) {
+ JSONObject object = new JSONObject();
+ object.put("order_no",orderPakin.getOrderNo());
+ jsonArray.add(object);
+ }
+ return R.ok().add(jsonArray);
}
@RequestMapping(value = "/order/head/page/auth")
--
Gitblit v1.9.1