From 1b79d0f4e8430353342e284e1de6ce220cb4a1f1 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 10 十一月 2025 09:09:59 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 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..0f4a444 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -80,6 +80,8 @@
private LocMastService locMastService;
@Autowired
private RgvOneSignService rgvOneSignService;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
@Override
@Transactional
@@ -1205,19 +1207,27 @@
@Transactional
public R cargoBookingNote(OrderCargoBookingNoteParam param) {
try{
- List<String[]> OutLocBoxCs = new ArrayList<>();
+ List<OrderOutLocBoxCsUtilParam> OutLocBoxCs = new ArrayList<>();
String orderNo = "ZH" + snowflakeIdWorker.nextId();
+
+ orderPakoutService.removeGroupGoodsNoUpdate(param.getGroupGoodsNo(),orderNo);
+
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