From bd96ecd68841a7115231131bce5ba874914b89b5 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 03 一月 2025 15:33:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/OrderGiftProofreadingExcelListener.java | 93 ++++++++--------------------------------------
1 files changed, 17 insertions(+), 76 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/OrderGiftProofreadingExcelListener.java b/src/main/java/com/zy/asrs/utils/OrderGiftProofreadingExcelListener.java
index 23a8ce0..a486f8a 100644
--- a/src/main/java/com/zy/asrs/utils/OrderGiftProofreadingExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OrderGiftProofreadingExcelListener.java
@@ -4,19 +4,21 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.DateUtils;
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.*;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WorkService;
-import com.zy.common.entity.OutLocBoxExcel;
+import com.zy.common.entity.OrderGiftProofreadingExcel;
+import com.zy.common.model.DetlDto;
import com.zy.common.model.LocDto;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -24,13 +26,12 @@
* Created by vincent on 2019-11-25
*/
@Slf4j
-public class OrderGiftProofreadingExcelListener extends AnalysisEventListener<OutLocBoxExcel> {
+public class OrderGiftProofreadingExcelListener extends AnalysisEventListener<OrderGiftProofreadingExcel> {
private int total = 0;
private String orderOneNo = null;
- private String cstmrName = null;
private Long userId;
- List<String[]> OutLocBoxCs = new ArrayList<>();
+ List<OrderGiftProofreadingExcel> OrderGiftProofreadingCs = new ArrayList<>();
public OrderGiftProofreadingExcelListener() {
}
@@ -44,7 +45,7 @@
*/
private static final int BATCH_COUNT = 50;
- private final List<OutLocBoxExcel> list = new ArrayList<>();
+ private final List<OrderGiftProofreadingExcel> list = new ArrayList<>();
/**
* 杩欓噷浼氫竴琛岃鐨勮繑鍥炲ご
@@ -57,11 +58,7 @@
* 杩欎釜姣忎竴鏉℃暟鎹В鏋愰兘浼氭潵璋冪敤
*/
@Override
- public void invoke(OutLocBoxExcel excel, AnalysisContext ctx) {
- String batch = excel.getBatch();
- String orderNo = excel.getOrderNo();
-// String cstmrName = excel.getCstmrName();
- String memo = excel.getMemo();
+ public void invoke(OrderGiftProofreadingExcel excel, AnalysisContext ctx) {
if (Cools.isEmpty(orderOneNo)){
if (!Cools.isEmpty(excel.getOrderNo())){
orderOneNo = excel.getOrderNo();
@@ -69,19 +66,7 @@
throw new CoolException("璁㈠崟鍙峰弬鏁颁负绌�");
}
}
- 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);
+ OrderGiftProofreadingCs.add(excel);
total++;
}
@@ -91,53 +76,11 @@
*/
@Override
public void doAfterAllAnalysed(AnalysisContext ctx) {
- if (!Cools.isEmpty(OutLocBoxCs) && OutLocBoxCs.size() != 0) {
- LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
- LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
+ if (!Cools.isEmpty(OrderGiftProofreadingCs) && !OrderGiftProofreadingCs.isEmpty()) {
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[4];
- locDetlNow[0] = locDetl.getBatch();
- locDetlNow[1] = outLocBoxC[1];
- locDetlNow[2] = outLocBoxC[2];
- locDetlNow[3] = outLocBoxC[3];
- 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());
- locDetl.setMemo(outLocBoxC[3]);
- LocDto locDto = new LocDto(locDetl);
+ for (OrderGiftProofreadingExcel orderGiftProofreadingExcel:OrderGiftProofreadingCs){
+ LocDto locDto = new LocDto(orderGiftProofreadingExcel);
locDtos.add(locDto);
}
@@ -164,20 +107,18 @@
locDetl.setOrigin(locDto.getOrigin());
locDetl.setWeight(locDto.getWeight());
locDetl.setMemo(locDto.getMemo());
-
+ locDetl.setVolume(locDto.getVolume());
+ locDetl.setPrice(locDto.getPrice());
locDetls.add(locDetl);
}
param.setLocDetls(locDetls);
param.setOrderNo(orderOneNo);
- param.setCstmrName(cstmrName);
-
if (total>0){
- workService.startupFullTakeStoreOrder(param,9999L);
+ workService.startupFullTakeStoreOrderGift(param,9999L);
}
-
}
- log.info("鍑哄簱{}鏉＄鍙凤紒", total);
+ log.info("瀵煎叆{}鏉℃牳瀵瑰崟鎹槑缁嗭紒", total);
}
public int getTotal() {
--
Gitblit v1.9.1