From 4ad1f324ab1fd2b51504afc00b43b4ee40f029c2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 20 二月 2025 09:40:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index 13d18e6..e8440e4 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;
@@ -32,6 +30,7 @@
private int total = 0;
private String orderOneNo = null;
+ private String cstmrName = null;
private Long userId;
List<String[]> OutLocBoxCs = new ArrayList<>();
@@ -63,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();
@@ -70,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++;
}
@@ -85,6 +95,7 @@
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<>();
@@ -96,13 +107,22 @@
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];
+ 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]);
}
@@ -118,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);
}
@@ -144,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