From 756fa60cebfb82ba824e87d080d44fc9ec34ecc8 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 02 九月 2025 14:01:09 +0800
Subject: [PATCH] 订单出库显示明细是否完成修复
---
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 102 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 99 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index e0a4fd3..13d18e6 100644
--- a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -2,10 +2,21 @@
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.R;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocDetl;
+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.common.entity.OutLocBoxExcel;
+import com.zy.common.model.LocDto;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
@@ -20,8 +31,9 @@
public class OutLocBoxExcelListener extends AnalysisEventListener<OutLocBoxExcel> {
private int total = 0;
+ private String orderOneNo = null;
private Long userId;
- List<String> batchs = new ArrayList<>();
+ List<String[]> OutLocBoxCs = new ArrayList<>();
public OutLocBoxExcelListener() {
}
@@ -50,7 +62,18 @@
@Override
public void invoke(OutLocBoxExcel excel, AnalysisContext ctx) {
String batch = excel.getBatch();
- batchs.add(batch);
+ 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] = orderOneNo;
+ OutLocBoxCs.add(s);
total++;
}
@@ -60,7 +83,80 @@
*/
@Override
public void doAfterAllAnalysed(AnalysisContext ctx) {
- log.info("鐢熸垚{}鏉″嚭搴撲换鍔★紒", total);
+ if (!Cools.isEmpty(OutLocBoxCs) && OutLocBoxCs.size() != 0) {
+ 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.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<>();
+ 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());
+ locDetl.setAnfme(locDto.getAnfme());
+ locDetl.setMatnr(locDto.getMatnr());
+ locDetl.setBatch(locDto.getBatch());
+ locDetl.setModel(locDto.getModel());
+ locDetl.setSpecs(locDto.getSpecs());
+ locDetl.setZpallet(locDto.getZpallet());
+ locDetl.setOrigin(locDto.getOrigin());
+ locDetl.setWeight(locDto.getWeight());
+
+ locDetls.add(locDetl);
+ }
+ param.setLocDetls(locDetls);
+ param.setOrderNo(orderOneNo);
+
+ if (total>0){
+ workService.startupFullTakeStoreOrder(param,9999L);
+ }
+
+ }
+
+ log.info("鍑哄簱{}鏉＄鍙凤紒", total);
}
public int getTotal() {
--
Gitblit v1.9.1