From 057e2cd464cc8773672ae6ddac7d32eb8cbc3a1f Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期一, 15 七月 2024 13:27:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 54 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index d915152..19c0db8 100644
--- a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -9,12 +9,10 @@
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.StockOutParam;
-import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.TagService;
-import com.zy.asrs.service.WorkService;
+import com.zy.asrs.service.*;
import com.zy.common.entity.OutLocBoxExcel;
import com.zy.common.model.LocDto;
import lombok.extern.slf4j.Slf4j;
@@ -31,6 +29,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 +61,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++;
}
@@ -77,16 +83,29 @@
public void doAfterAllAnalysed(AnalysisContext ctx) {
if (!Cools.isEmpty(OutLocBoxCs) && OutLocBoxCs.size() != 0) {
LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
+ LocMastService locMastService = SpringUtils.getBean(LocMastService.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]+" 鏈煡璇㈠埌鏁版嵁锛侊紒锛�");
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlSou.getLocNo()));
+ if (Cools.isEmpty(locMast)){
+ throw new CoolException("绠卞彿锛�"+outLocBoxC[0]+" 鎵�鍦ㄥ簱浣嶄笉婊¤冻鍑哄簱鏉′欢锛侊紒锛佹湭鏌ヨ鍒版绠卞彿鎵�鍦ㄥ簱浣�");
+ }
+ if (!locMast.getLocSts().equals("F")){
+ throw new CoolException("绠卞彿锛�"+outLocBoxC[0]+" 鎵�鍦ㄥ簱浣嶄笉婊¤冻鍑哄簱鏉′欢锛侊紒锛佸簱浣嶇姸鎬佷笉涓篎锛侊紒锛佸簱浣嶇姸鎬侊細"+locMast.getLocSts$());
+ }
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];
@@ -101,16 +120,25 @@
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.setOrigin(locDetl.getOrigin());
- locDto.setWeight(locDetl.getWeight());
+// 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);
}
StockOutParam param = new StockOutParam();
ArrayList<StockOutParam.LocDetl> locDetls = new ArrayList<>();
- for (LocDto locDto:locDtos){
+ List<LocDto> locDtosList = new ArrayList<>();
+ List<String> batchList = new ArrayList<>();
+ for (LocDto locDto : locDtos) {
+ if (!batchList.contains(locDto.getBatch())){
+ batchList.add(locDto.getBatch());
+ locDtosList.add(locDto);
+ }
+ }
+ for (LocDto locDto:locDtosList){
StockOutParam.LocDetl locDetl = new StockOutParam.LocDetl();
locDetl.setBrand(locDto.getBrand());
locDetl.setLocNo(locDto.getLocNo());
@@ -123,11 +151,10 @@
locDetl.setOrigin(locDto.getOrigin());
locDetl.setWeight(locDto.getWeight());
- param.setOrderNo(locDto.getOrderNo());
-
locDetls.add(locDetl);
}
param.setLocDetls(locDetls);
+ param.setOrderNo(orderOneNo);
if (total>0){
workService.startupFullTakeStoreOrder(param,9999L);
@@ -135,8 +162,7 @@
}
-
- log.info("瀵煎叆{}鏉＄鍙凤紒", total);
+ log.info("鍑哄簱{}鏉＄鍙凤紒", total);
}
public int getTotal() {
--
Gitblit v1.9.1