From 3c992dd950b539f03cdf64898f8bfba65c2313b8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 08 十一月 2025 15:10:25 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 8084f72..b16528f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1205,19 +1205,24 @@
     @Transactional
     public R cargoBookingNote(OrderCargoBookingNoteParam param) {
         try{
-            List<String[]> OutLocBoxCs = new ArrayList<>();
+            List<OrderOutLocBoxCsUtilParam> OutLocBoxCs = new ArrayList<>();
             String orderNo = "ZH" + snowflakeIdWorker.nextId();
             for (OrderCargoBookingNoteParam.Box box : param.getBoxList()){
                 for (OrderCargoBookingNoteParam.Box.Roll roll : box.getRollList()){
-                    String[] outLocBox = new String[]{box.getBoxNo(),orderNo,param.getCstmrName(),roll.getMemo(),"鍚堟牸"};
+                    OrderOutLocBoxCsUtilParam outLocBox = new OrderOutLocBoxCsUtilParam();
+                    outLocBox.setBoxNo(box.getBoxNo());
+                    outLocBox.setRoll(roll.getRollNo());
+                    outLocBox.setMemo(roll.getMemo());
+                    outLocBox.setOrderOneNo(orderNo);
+                    outLocBox.setCstmrName(param.getCstmrName());
+                    outLocBox.setDanger("鍚堟牸");
                     OutLocBoxCs.add(outLocBox);
                 }
             }
 
             if (!OutLocBoxCs.isEmpty()){
-                OrderOutBatchUtil orderOutBatchUtil = new OrderOutBatchUtil(orderNo,param.getCstmrName(),"","MES涓嬪彂璁″垝缁勮揣鍗�","璁″垝缁勮揣鍗�",true,param.getGroupGoodsNo());
+                OrderOutBatchUtil orderOutBatchUtil = new OrderOutBatchUtil(orderNo,param.getCstmrName(),"","MES涓嬪彂璁″垝缁勮揣鍗�","璁″垝缁勮揣鍗�",false,param.getGroupGoodsNo());
                 return orderOutBatchUtil.setOrderOutBatchCargoBookingNote(OutLocBoxCs);
-//                return R.ok();
             }
         } catch (Exception e) {
             throw new CoolException("缁勮揣鍗曞彿锛�"+param.getGroupGoodsNo()+"璁″垝缁勮揣鍗曟帴鏀跺け璐ワ紒锛侊紒"+e.getMessage());

--
Gitblit v1.9.1