From d60e84cbedb554555578f071de95c4a8049183db Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 13 六月 2025 15:16:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index d037b41..30d6867 100644
--- a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -31,6 +31,7 @@
public class OutLocBoxExcelListener extends AnalysisEventListener<OutLocBoxExcel> {
private int total = 0;
+ private String orderOneNo = null;
private Long userId;
List<String[]> OutLocBoxCs = new ArrayList<>();
@@ -62,9 +63,16 @@
public void invoke(OutLocBoxExcel excel, AnalysisContext ctx) {
String batch = excel.getBatch();
String orderNo = excel.getOrderNo();
+ if (Cools.isEmpty(orderOneNo)){
+ if (!Cools.isEmpty(excel.getOrderNo())){
+ orderOneNo = excel.getOrderNo();
+ } else {
+ throw new CoolException("璁㈠崟鍙峰弬鏁颁负绌�");
+ }
+ }
String[] s=new String[2];
s[0] = batch;
- s[1] = orderNo;
+ s[1] = orderOneNo;
OutLocBoxCs.add(s);
total++;
}
@@ -79,14 +87,38 @@
LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
WorkService workService = SpringUtils.getBean(WorkService.class);
List<LocDto> locDtos = new ArrayList<>();
+ List<String[]> outLocBoxCList = new ArrayList<>();
+ List<String> outLocBoxCNew = new ArrayList<>();
for (String[] outLocBoxC:OutLocBoxCs){
+ total--;
+ if (!outLocBoxCNew.contains(outLocBoxC[0])){
+ LocDetl locDetlSou = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", outLocBoxC[0]));
+ if (Cools.isEmpty(locDetlSou)){
+ throw new CoolException("鎵规锛�"+outLocBoxC[0]+" 鏈煡璇㈠埌鏁版嵁锛侊紒锛�");
+ }
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("loc_no", locDetlSou.getLocNo()).eq("origin", locDetlSou.getOrigin()));
+ for (LocDetl locDetl:locDetls){
+ total++;
+ String[] locDetlNow=new String[2];
+ locDetlNow[0] = locDetl.getBatch();
+ locDetlNow[1] = outLocBoxC[1];
+ outLocBoxCList.add(locDetlNow);
+ outLocBoxCNew.add(outLocBoxC[0]);
+ }
+ }
+ }
+ for (String[] outLocBoxC:outLocBoxCList){
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", outLocBoxC[0]));
if (Cools.isEmpty(locDetl)){
total--;
continue;
}
- LocDto locDto = new LocDto(locDetl.getManu(), locDetl.getMatnr(), locDetl.getMaktx(),locDetl.getModel(),locDetl.getSpecs(),
- locDetl.getBatch(),locDetl.getBrand(),locDetl.getBarcode(), outLocBoxC[1],locDetl.getAnfme());
+// LocDto locDto = new LocDto(locDetl.getManu(), locDetl.getMatnr(), locDetl.getMaktx(),locDetl.getModel(),locDetl.getSpecs(),
+// locDetl.getBatch(),locDetl.getBrand(),locDetl.getBarcode(), outLocBoxC[1],locDetl.getAnfme());
+// locDto.setOrigin(locDetl.getOrigin());
+// locDto.setWeight(locDetl.getWeight());
+ LocDto locDto = new LocDto(locDetl);
locDtos.add(locDto);
}
@@ -102,12 +134,13 @@
locDetl.setModel(locDto.getModel());
locDetl.setSpecs(locDto.getSpecs());
locDetl.setZpallet(locDto.getZpallet());
-
- param.setOrderNo(locDto.getOrderNo());
+ locDetl.setOrigin(locDto.getOrigin());
+ locDetl.setWeight(locDto.getWeight());
locDetls.add(locDetl);
}
param.setLocDetls(locDetls);
+ param.setOrderNo(orderOneNo);
if (total>0){
workService.startupFullTakeStoreOrder(param,9999L);
@@ -115,8 +148,7 @@
}
-
- log.info("瀵煎叆{}鏉＄鍙凤紒", total);
+ log.info("鍑哄簱{}鏉＄鍙凤紒", total);
}
public int getTotal() {
--
Gitblit v1.9.1