From 4efbf695ce0e0e6565e75305a57ea4c4bbc2c45d Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 16 三月 2026 13:56:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderPakinController.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakinController.java b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
index e3222c9..540790e 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
@@ -90,7 +90,27 @@
}
wrapper.eq("status", 1);
wrapper.eq("move_status", 0);
- return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
+ Page<OrderPakin> page = orderService.selectPage(new Page<>(curr, limit), wrapper);
+ if (page != null && page.getRecords() != null) {
+ for (OrderPakin order : page.getRecords()) {
+ if (order == null || Cools.isEmpty(order.getOrderNo())) {
+ continue;
+ }
+ int total = orderDetlPakinService.selectCount(new EntityWrapper<OrderDetlPakin>()
+ .eq("order_no", order.getOrderNo())
+ .eq("status", 1));
+ if (total <= 0) {
+ order.setIssueComplete(0);
+ continue;
+ }
+ int notComplete = orderDetlPakinService.selectCount(new EntityWrapper<OrderDetlPakin>()
+ .eq("order_no", order.getOrderNo())
+ .eq("status", 1)
+ .where("be_batch is null or be_batch < anfme"));
+ order.setIssueComplete(notComplete <= 0 ? 1 : 0);
+ }
+ }
+ return R.ok(page);
}
@RequestMapping(value = "/actual/shipment/order/report/auth")
@@ -103,6 +123,20 @@
return R.error("澶辫触").add("澶辫触");
}
+ @RequestMapping(value = "/order/oneKey/issue/auth")
+ @ManagerAuth(memo = "涓�閿笅鍙�")
+ @Transactional
+ public R oneKeyIssue(@RequestParam String orderNo) {
+ if (Cools.isEmpty(orderNo)) {
+ return R.error("璁㈠崟鍙蜂笉鑳戒负绌�");
+ }
+ if (!orderDetlPakinService.issueAll(orderNo)) {
+ return R.error("涓嬪彂鏄庣粏鏇存柊澶辫触");
+ }
+ orderService.updateOrderStatus(orderNo);
+ return R.ok("鎴愬姛").add("鎴愬姛");
+ }
+
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
public R head(@RequestParam Long orderId){
--
Gitblit v1.9.1