From 6eecac9d82c970acf021669e3bb4cd782f36bbfe Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 24 一月 2024 11:34:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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..d915152 100644
--- a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -79,7 +79,23 @@
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){
+ if (!outLocBoxCNew.contains(outLocBoxC[0])){
+ LocDetl locDetlSou = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", outLocBoxC[0]));
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("loc_no", locDetlSou.getLocNo()).eq("origin", locDetlSou.getOrigin()));
+ for (LocDetl locDetl:locDetls){
+ 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--;
@@ -87,6 +103,8 @@
}
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());
locDtos.add(locDto);
}
@@ -102,6 +120,8 @@
locDetl.setModel(locDto.getModel());
locDetl.setSpecs(locDto.getSpecs());
locDetl.setZpallet(locDto.getZpallet());
+ locDetl.setOrigin(locDto.getOrigin());
+ locDetl.setWeight(locDto.getWeight());
param.setOrderNo(locDto.getOrderNo());
--
Gitblit v1.9.1