From b9068e2a764816ea72d85ec9c423c79f7896d4c4 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 03 七月 2024 16:51:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java | 19 ++++++++++++++-----
src/main/java/com/zy/asrs/controller/MatController.java | 5 +++--
src/main/java/com/zy/asrs/controller/MobileController.java | 3 +++
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 14 ++++++++++----
4 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 63aa249..9eb5a6a 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -18,6 +18,7 @@
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.asrs.utils.OutLocBoxExcelListener;
+import com.zy.asrs.utils.OutpandianBoxExeclListener;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
import com.zy.common.entity.MatExcel;
@@ -385,8 +386,8 @@
@ManagerAuth(memo = "瀵煎叆绠卞彿鐩樼偣鍑哄簱")
@Transactional
public R outLocBoxExcelImport1(MultipartFile file) throws IOException {
- OutLocBoxExcelListener listener = new OutLocBoxExcelListener(getUserId());
- EasyExcel.read(file.getInputStream(), OutLocBoxExcel.class, listener).sheet().doRead();
+ OutpandianBoxExeclListener listener = new OutpandianBoxExeclListener(getUserId());
+ EasyExcel.read(file.getInputStream(), pandianExcel.class, listener).sheet().doRead();
return R.ok("鎴愬姛鍑哄簱"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
}
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 9608121..82aed8b 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -217,6 +217,9 @@
if (Cools.isEmpty(batch)){
return R.error("鍙傛暟涓虹┖");
}
+ String[] batch1 = batch.split("绠卞彿锛�");
+ String[] batch2 = batch1[1].split("瑙勬牸锛�");
+ batch = batch2[0];
// List<Order> orders = orderService.selectorderNoL(batch);
WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch));
if (Cools.isEmpty(wrkDetl)){
diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index 13d18e6..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;
@@ -85,6 +83,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,6 +95,13 @@
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){
diff --git a/src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java b/src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java
index dbbbb42..320f008 100644
--- a/src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java
@@ -8,8 +8,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.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.pandianExcel;
import com.zy.common.model.LocDto;
@@ -74,6 +76,7 @@
ArrayList<LocDetl> locDetls1 = new ArrayList<>();
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<>();
@@ -85,13 +88,19 @@
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];
outLocBoxCList.add(locDetlNow);
outLocBoxCNew.add(outLocBoxC[0]);
}
@@ -135,12 +144,12 @@
locDetls1.add(locDetl);
}
- //if (total>0){
- // workService.startupFullTakeStoreOrder(param,9999L);
- //}
+ if (total>0){
+ workService.locCheckOut(param,9999L);
+ }
}
- //return locDetls1;
+ log.info("鐩樼偣鍑哄簱{}鏉＄鍙凤紒", total);
}
public int getTotal() {
--
Gitblit v1.9.1