From bd96ecd68841a7115231131bce5ba874914b89b5 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 03 一月 2025 15:33:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index 19c0db8..e8440e4 100644
--- a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -30,6 +30,7 @@
private int total = 0;
private String orderOneNo = null;
+ private String cstmrName = null;
private Long userId;
List<String[]> OutLocBoxCs = new ArrayList<>();
@@ -61,6 +62,8 @@
public void invoke(OutLocBoxExcel excel, AnalysisContext ctx) {
String batch = excel.getBatch();
String orderNo = excel.getOrderNo();
+// String cstmrName = excel.getCstmrName();
+ String memo = excel.getMemo();
if (Cools.isEmpty(orderOneNo)){
if (!Cools.isEmpty(excel.getOrderNo())){
orderOneNo = excel.getOrderNo();
@@ -68,9 +71,18 @@
throw new CoolException("璁㈠崟鍙峰弬鏁颁负绌�");
}
}
- String[] s=new String[2];
+ if (Cools.isEmpty(cstmrName)){
+ if (!Cools.isEmpty(excel.getCstmrName())){
+ cstmrName = excel.getCstmrName();
+ } else {
+ throw new CoolException("瀹㈡埛鍚嶇О鍙傛暟涓虹┖");
+ }
+ }
+ String[] s=new String[4];
s[0] = batch;
s[1] = orderOneNo;
+ s[2] = cstmrName;
+ s[3] = memo;
OutLocBoxCs.add(s);
total++;
}
@@ -106,9 +118,11 @@
.eq("loc_no", locDetlSou.getLocNo()).eq("origin", locDetlSou.getOrigin()));
for (LocDetl locDetl:locDetls){
total++;
- String[] locDetlNow=new String[2];
+ String[] locDetlNow=new String[4];
locDetlNow[0] = locDetl.getBatch();
locDetlNow[1] = outLocBoxC[1];
+ locDetlNow[2] = outLocBoxC[2];
+ locDetlNow[3] = outLocBoxC[3];
outLocBoxCList.add(locDetlNow);
outLocBoxCNew.add(outLocBoxC[0]);
}
@@ -124,6 +138,7 @@
// locDetl.getBatch(),locDetl.getBrand(),locDetl.getBarcode(), outLocBoxC[1],locDetl.getAnfme());
// locDto.setOrigin(locDetl.getOrigin());
// locDto.setWeight(locDetl.getWeight());
+ locDetl.setMemo(outLocBoxC[3]);
LocDto locDto = new LocDto(locDetl);
locDtos.add(locDto);
}
@@ -150,11 +165,13 @@
locDetl.setZpallet(locDto.getZpallet());
locDetl.setOrigin(locDto.getOrigin());
locDetl.setWeight(locDto.getWeight());
+ locDetl.setMemo(locDto.getMemo());
locDetls.add(locDetl);
}
param.setLocDetls(locDetls);
param.setOrderNo(orderOneNo);
+ param.setCstmrName(cstmrName);
if (total>0){
workService.startupFullTakeStoreOrder(param,9999L);
--
Gitblit v1.9.1