From c90f42702b056664dbb3502a14041ba902273665 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 27 十一月 2025 18:31:29 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OrderController.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 4fcd85b..59741ab 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -42,6 +42,8 @@
     private WrkMastService wrkMastService;
     @Autowired
     private WrkMastLogService wrkMastLogService;
+    @Autowired
+    private LocOwnerService locOwnerService;
 
     @RequestMapping(value = "/order/nav/list/auth")
     @ManagerAuth
@@ -113,6 +115,12 @@
                 status = (docType.getPakin() == 1 ? 1 :  2 );
             }
         }
+        LocOwner locOwner = null;
+        if (!Cools.isEmpty(param.getOwnerId())) {
+            locOwner = locOwnerService.selectById(param.getOwnerId());
+        } else {
+            locOwner = locOwnerService.selectById(1);
+        }
 
         Order order = orderService.selectByNo(param.getOrderNo());
         if (order != null) {
@@ -125,7 +133,7 @@
                 DateUtils.convert(now),    // 鍗曟嵁鏃ユ湡
                 param.getDocType(),    // 鍗曟嵁绫诲瀷
                 null,    // 椤圭洰缂栧彿
-                null,    //
+                null,    //椤圭洰鍚嶇О 瀹㈡埛PO鍙�
                 null,    // 璋冩嫧椤圭洰缂栧彿
                 null,    // 鍒濆绁ㄦ嵁鍙�
                 null,    // 绁ㄦ嵁鍙�
@@ -181,6 +189,10 @@
                 orderDetl.setUpdateTime(now);
                 orderDetl.setStatus(1);
                 orderDetl.setQty(0.0D);
+//                orderDetl.setStandby1(param.getStandby1().toString());//po
+//                orderDetl.setBoxType1(locOwner.getId().toString());//璐т富ID
+//                orderDetl.setBoxType2(locOwner.getOwnerUuid().toString());//璐т富UUID
+//                orderDetl.setBoxType3(locOwner.getOwner());//璐т富
                 orderDetl.setPakinPakoutStatus(status);
                 if (!orderDetlService.insert(orderDetl)) {
                     throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗eけ璐�");

--
Gitblit v1.9.1