From 7b26abe9d5e833901783613bbb3cfa27fa75a346 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 20 十一月 2023 20:17:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 97 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 73 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 9638cdc..da0d56d 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -13,14 +13,13 @@
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.StaDescService;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.LocDto;
import com.zy.common.model.QueryStockPreDo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
@Service("locDetlService")
public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
@@ -40,11 +39,11 @@
}
@Override
- public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch) {
+ public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch, String containerCode, String csoCode, String isoCode) {
if (anfme <= 0) {
- return this.baseMapper.deleteItem(locNo, matnr, batch) > 0;
+ return this.baseMapper.deleteItem(locNo, matnr, batch, containerCode, csoCode, isoCode) > 0;
} else {
- return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0;
+ return baseMapper.updateAnfme(anfme, locNo, matnr, batch, containerCode, csoCode, isoCode) > 0;
}
}
@@ -108,26 +107,26 @@
wapperSetCondition(wrapper,"batch",batch);
wapperSetCondition(wrapper,"three_code",csocode);
wapperSetCondition(wrapper,"dead_time",isoseq);
-// if(Cools.isEmpty(batch)){
-// wrapper.isNull("batch");
-// }else {
-// wrapper.eq("batch",batch);
-// }
List<LocDetl> locDetlList = this.selectList(wrapper);
- for (LocDetl locDetl : locDetlList) {
- //鍒ゆ柇褰撳墠搴撲綅璐х墿鏄惁F鍦ㄥ簱
- LocMast locMast = locMastService.selectById(locDetl.getLocNo());
- if(!"F".equals(locMast.getLocSts())){
- continue;
- }
+
+ Set<LocDetl> resort = resort(locDetlList);
+
+ for (LocDetl locDetl : resort) {
+
if (issued > 0) {
double anfme = locDetl.getAnfme();
int ioType = anfme > issued ? 103 : 101;
anfme = anfme > issued ? issued : anfme;
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderNo, anfme);
- //List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
+
List<Integer> outSite = basDevpService.getAvailableOutSite(101);
+ List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
+ pickOutSite.forEach(site -> {
+ if(!outSite.contains(site)){
+ outSite.add(site);
+ }
+ });
locDto.setStaNos(outSite);
locDto.setCsocode(csocode);
@@ -147,14 +146,10 @@
wapperSetCondition(wrapper,"batch",batch);
wapperSetCondition(wrapper,"three_code",csocode);
wapperSetCondition(wrapper,"dead_time",isoseq);
-// if(Cools.isEmpty(batch)){
-// wrapper.isNull("batch");
-// }else {
-// wrapper.eq("batch",batch);
-// }
List<LocDetl> locDetlList = this.selectList(wrapper);
- for (LocDetl locDetl : locDetlList) {
+ Set<LocDetl> resort = resort(locDetlList);
+ for (LocDetl locDetl : resort) {
//鍒ゆ柇褰撳墠搴撲綅璐х墿鏄惁F鍦ㄥ簱
LocMast locMast = locMastService.selectById(locDetl.getLocNo());
if(!"F".equals(locMast.getLocSts())){
@@ -229,6 +224,25 @@
return this.baseMapper.selectLocNo(matnr);
}
+ public Set<String> selectLocNo(String matnr, String batch, String csocode, String isocode) {
+
+ Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", matnr);
+ Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
+ List<LocDetl> locDetls = this.selectList(wrapper);
+
+ Set<String> locNos = new HashSet<>();
+ locDetls.forEach(locDetl -> {
+ locNos.add(locDetl.getLocNo());
+ });
+
+ return locNos;
+
+ }
+
+ public LocDetl selectByContainerCode(String containerCode) {
+ return this.selectOne(new EntityWrapper<LocDetl>().eq("supp_code",containerCode));
+ }
+
@Override
public int updateStockFreeze(String matnr, String locNo, Integer stockFreeze) {
return this.baseMapper.updateStockFreeze(matnr, locNo, stockFreeze);
@@ -241,4 +255,39 @@
wrapper.eq(column,condition);
}
}
+
+ //鏍规嵁娣辨祬搴撲綅杩涜閲嶆柊鎺掑簭
+ private Set<LocDetl> resort(List<LocDetl> locDetls){
+ Set<LocDetl> locDetlsResort = new LinkedHashSet<>();
+
+ for(LocDetl locDetl : locDetls){
+ LocMast locMast = locMastService.selectById(locDetl.getLocNo());
+ if(!"F".equals(locMast.getLocSts())){
+ continue;
+ }
+
+ List<String> groupOuterLoc = Utils.getGroupOuterLoc(locDetl.getLocNo());
+
+ if(Cools.isEmpty(groupOuterLoc)){
+ locDetlsResort.add(locDetl);
+ }else {
+ groupOuterLoc.add(locDetl.getLocNo());
+ //濡傛灉鏄繁搴撲綅锛屽垯鍏堟壘澶栦晶鐨勫簱浣�
+ for (String locNo : groupOuterLoc){
+ LocMast locMastOuter = locMastService.selectById(locNo);
+ //澶栦晶濡傛灉鏄嫞鏂欙紝鍒欏唴娴嬩笉鍏佽鍑�
+ if("P".equals(locMastOuter.getLocSts()) || "Q".equals(locMastOuter.getLocSts()) || "S".equals(locMastOuter.getLocSts())){
+ break;
+ }
+
+ if(!"F".equals(locMastOuter.getLocSts())){
+ continue;
+ }
+ locDetlsResort.addAll(this.selectByLocNo(locNo));
+
+ }
+ }
+ }
+ return locDetlsResort;
+ }
}
--
Gitblit v1.9.1