From a5060ab5211bdf560b5f3169f1bc602081496876 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 10 十月 2024 20:27:37 +0800
Subject: [PATCH] #优化
---
src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java | 21 +++++++++++++++++----
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 8 +-------
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 2a1c0d2..09fbb2d 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -663,8 +663,6 @@
public void locCheckOut(StockOutParam param, Long userId) {
// 鐩爣绔欑偣鐘舵�佹娴�
BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
- BasDevp staNo122 = basDevpService.checkSiteStatus(122);
- BasDevp staNo171 = basDevpService.checkSiteStatus(171);
// 鑾峰彇搴撲綅鏄庣粏
List<LocDetlDto> locDetlDtos = new ArrayList<>();
for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
@@ -675,11 +673,7 @@
}
if (!locDetlDtos.isEmpty()) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
- if (locMast.getCrnNo()>3){
- staNo = staNo171;
- } else {
- staNo = staNo122;
- }
+
if (locMast.getLocSts().equals("F")){
// 鍚姩鍑哄簱寮�濮� 107.鐩樼偣鍑哄簱
stockOut(staNo, locDetlDtos, IoWorkType.CHECK_OUT, userId);
diff --git a/src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java b/src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java
index 1ac857f..6930fca 100644
--- a/src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java
@@ -74,6 +74,8 @@
@ManagerAuth
public void doAfterAllAnalysed(AnalysisContext ctx) {
ArrayList<StockOutParam.LocDetl> locDetls1 = new ArrayList<StockOutParam.LocDetl>();
+ ArrayList<StockOutParam.LocDetl> locDetls122 = new ArrayList<StockOutParam.LocDetl>();
+ ArrayList<StockOutParam.LocDetl> locDetls171 = new ArrayList<StockOutParam.LocDetl>();
if (!Cools.isEmpty(OutLocBoxCs) && OutLocBoxCs.size() != 0) {
LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
@@ -143,12 +145,23 @@
locDetl.setWeight(locDto.getWeight());
locDetls1.add(locDetl);
+ if (Utils.getRow(locDetl.getLocNo())>12){
+ locDetls171.add(locDetl);
+ } else {
+ locDetls122.add(locDetl);
+ }
}
- StockOutParam param = new StockOutParam();
- param.setOutSite(122);
- param.setLocDetls(locDetls1);
+ StockOutParam param122 = new StockOutParam();
+ param122.setOutSite(122);
+ param122.setLocDetls(locDetls122);
if (total>0){
- workService.locCheckOut(param,9999L);
+ workService.locCheckOut(param122,9999L);
+ }
+ StockOutParam param171 = new StockOutParam();
+ param171.setOutSite(171);
+ param171.setLocDetls(locDetls171);
+ if (total>0){
+ workService.locCheckOut(param171,9999L);
}
}
--
Gitblit v1.9.1