From 9f095733d13185290cfedd242b5f299585fbcad0 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 07 四月 2025 10:05:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 112 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 83 insertions(+), 29 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 ee8b387..5ecdbb0 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -19,10 +19,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
@Service("locDetlService")
public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
@@ -42,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;
}
}
@@ -58,6 +55,11 @@
@Override
public List<String> getSameDetl(String matnr) {
return this.baseMapper.selectSameDetl(matnr);
+ }
+
+ @Override
+ public List<String> getSameLevDetl(String matnr, Integer lev) {
+ return this.baseMapper.selectSameLevDetl(matnr, lev);
}
@Override
@@ -110,26 +112,32 @@
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);
+
+ //鐢ㄤ簬鏄剧ず宸ヤ綔鏄庣粏妗ｇ殑璁㈠崟鍙�
+ String orderNoWrkDtel = Utils.getOrderNo(orderNo,anfme);
+ //鏇存柊璁㈠崟鏁伴噺
+ orderNo = Utils.orderMergeUpdate(orderNo,anfme);
+
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderNoWrkDtel, anfme);
+
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);
@@ -149,14 +157,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())){
@@ -231,10 +235,10 @@
return this.baseMapper.selectLocNo(matnr);
}
- public Set<String> selectLocNo(String matnr, String batch, String csocode, String isocode) {
+ public Set<String> selectLocNos(String matnr) {
Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", matnr);
- Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
+ //Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
List<LocDetl> locDetls = this.selectList(wrapper);
Set<String> locNos = new HashSet<>();
@@ -246,6 +250,16 @@
}
+ public LocDetl selectByContainerCode(String containerCode) {
+ return this.selectOne(new EntityWrapper<LocDetl>().eq("supp_code",containerCode));
+ }
+
+ @Override
+ public List<LocDetl> selectByLocWithoutContainer(String locNo) {
+ return this.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo)
+ .andNew().eq("supp_code", "").or().isNull("supp_code"));
+ }
+
@Override
public int updateStockFreeze(String matnr, String locNo, Integer stockFreeze) {
return this.baseMapper.updateStockFreeze(matnr, locNo, stockFreeze);
@@ -255,7 +269,47 @@
if(Cools.isEmpty(condition)){
wrapper.andNew().eq(column,"").or().isNull(column);
}else {
- wrapper.eq(column,condition);
+ wrapper.andNew().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;
+ }
+
+ @Override
+ public int updateNewMatnr(String matnrOld, String matnrNew) {
+ return this.baseMapper.updateNewMatnr(matnrOld, matnrNew);
+ }
}
--
Gitblit v1.9.1