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 | 65 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakinController.java b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
index 05e35be..540790e 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
@@ -44,6 +44,8 @@
private WrkMastLogService wrkMastLogService;
@Autowired
private LocOwnerService locOwnerService;
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -87,7 +89,52 @@
wrapper.orderBy("settle").orderBy("create_time", false);
}
wrapper.eq("status", 1);
- return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.eq("move_status", 0);
+ 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")
+ @ManagerAuth(memo = "涓婃姤MES瀹為檯缁勮揣鍗�")
+ public R actualShipmentOrder(@RequestParam String orderNo) {
+ try{
+ orderService.updateOrderStatus(orderNo); //鏇存柊璁㈠崟鐘舵�� 0 -> 1
+ return R.ok("鎴愬姛").add("鎴愬姛");
+ } catch (Exception e) {}
+ 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")
@@ -378,7 +425,21 @@
throw new CoolException("瀛樺湪浣滀笟涓暟鎹紝涓嶈兘瀹岀粨銆傝妫�鏌ュ叆搴撻�氱煡妗ｅ拰宸ヤ綔妗�");
}
}
-
+ if(order.getSettle() == 66){
+ List<OrderDetlPakin> lists = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_no",order.getOrderNo()));
+ for (OrderDetlPakin orderDetlPakin : lists) {
+ String boxType3 = orderDetlPakin.getBoxType3();
+ if (boxType3 == null || !boxType3.contains("HDU")) {
+ throw new CoolException(
+ String.format("璁㈠崟 %s 鐨勬槑缁嗕腑涓嶅瓨鍦ㄥ寘鍚獺DU鐨勭墿鏂欐槑缁�: %s (鐗╂枡: %s)",
+ order.getOrderNo(),
+ boxType3,
+ orderDetlPakin.getMatnr() != null ? orderDetlPakin.getMatnr() : "鏈煡鐗╂枡"
+ )
+ );
+ }
+ }
+ }
order.setUpdateBy(getUserId());
order.setUpdateTime(new Date());
if (!orderService.updateById(order)) {
--
Gitblit v1.9.1