From 98ff94c52485dd502e10c061ae267bf24e5d1814 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 17 十一月 2023 08:26:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index 6b13866..5932832 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -77,7 +77,8 @@
locDto.setContainerCode(agvLocDetl.getSuppCode());
//褰撳墠搴撲綅鎵�澶勬ゼ灞�
int floor = Integer.parseInt(agvLocDetl.getLocNo().split("@")[1]);
- locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
+ //locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
+ locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByFloor(floor));
locDtoList.add(locDto);
issued -= anfme;
@@ -140,33 +141,18 @@
Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
wrapper.eq("loc_no", locNo);
if (anfme <= 0) {
- return this.delete(wrapper);
+ return this.baseMapper.deleteLocDetl(locNo,anfme,matnr,batch,csocode,isocode) > 0;
} else {
AgvLocDetl agvLocDetl = this.selectOne(wrapper);
agvLocDetl.setAnfme(anfme);
- return this.update(agvLocDetl,wrapper);
- //return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0;
+ return this.baseMapper.updateAnfme(locNo,anfme,matnr,batch,csocode,isocode) > 0;
}
}
- private List<String> queryAgvStaNosByFloor(int floor){
- List<String> agvStaNos = new ArrayList<>();
- if(floor == 1){
- agvStaNos.add("CS-101");
- agvStaNos.add("CS-102");
- }else if(floor ==3){
- agvStaNos.add("CS-305");
- agvStaNos.add("CS-306");
- agvStaNos.add("CS-307");
- }
-
- return agvStaNos;
- }
private void wapperSetCondition(Wrapper wrapper,String column, String condition){
if(Cools.isEmpty(condition)){
wrapper.andNew().eq(column,"").or().isNull(column);
- //wrapper.isNull(column);
}else {
wrapper.eq(column,condition);
}
@@ -181,15 +167,16 @@
List<AgvLocDetl> agvLocDetls = new ArrayList<>();
taskDto.getLocDtos().forEach(locDto -> {
- AgvLocDetl agvLocDetl = this.selectByMatnrAndBatchAndCsocodeAndisoCode(locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
+ AgvLocDetl agvLocDetl = this.selectByMatnrAndBatchAndCsocodeAndisoCode(locDto.getLocNo(),locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
agvLocDetls.add(agvLocDetl);
});
return agvLocDetls;
}
@Override
- public AgvLocDetl selectByMatnrAndBatchAndCsocodeAndisoCode(String matnr, String batch, String csocode, String isocode) {
+ public AgvLocDetl selectByMatnrAndBatchAndCsocodeAndisoCode(String locNo, String matnr, String batch, String csocode, String isocode) {
EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
+ wrapper.eq("loc_no",locNo);
Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
return this.selectOne(wrapper);
}
@@ -199,5 +186,10 @@
return this.baseMapper.sumByLocNo(locNo);
}
+ @Override
+ public AgvLocDetl selectLocdetl(String locNo, String matnr, String batch, String csocode, String isocode) {
+ return this.baseMapper.selectLocdetl(locNo,matnr,batch,csocode,isocode);
+ }
+
}
--
Gitblit v1.9.1