From cf8b2e91499acfe209cd02f5714822b81d6d9598 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 13 十二月 2023 17:42:35 +0800
Subject: [PATCH] 平库库存调整修改
---
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
index a471d65..be68977 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -142,29 +142,35 @@
List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>()
.eq("supp_code", agvBasDevpDto.getBarcode()));
- agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
+ if(!Cools.isEmpty(agvWaitPakinList)){
+ agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
+ agvBasDevpDto.setAgvWaitPakin(agvWaitPakinList.get(0));
+ }
if(Cools.isEmpty(agvWaitPakinList)){
- //AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",agvWrkMast.getWrkNo()));
List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
//agv绔欑偣鍙鍖栫鐞嗕腑鐨勭粨浣欐暟閲忔樉绀�
for(AgvWrkDetl agvWrkDetl : agvWrkDetlList){
agvWrkDetl.setVolume(0.0);
- AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getSourceLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
if(agvWrkMast.getIoType() == 103){
- //AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getSourceLocNo());
- //AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getSourceLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
- agvWrkDetl.setVolume(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
+ //瀵绘壘鏄惁鏈夌浉鍚岀墿鏂欑殑宸ヤ綔妗ｆ槑缁嗭紝骞惰繑鍥炴暟閲忎箣鍜�
+ double anfme = getAllAnfmeInAgvWrkDetlList(agvWrkDetlList,agvWrkDetl);
+
+ AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getSourceLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
+ agvWrkDetl.setVolume(agvLocDetl.getAnfme() - anfme);
}
if(agvWrkMast.getIoType() == 53){
- //AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getLocNo());
+ AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
agvWrkDetl.setVolume(agvLocDetl.getAnfme());
- //agvWrkDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
}
}
- agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
+ if(!Cools.isEmpty(agvWrkDetlList)){
+ agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
+ agvBasDevpDto.setAgvWrkDetl(agvWrkDetlList.get(0));
+ }
+
}
}
@@ -186,6 +192,19 @@
return result;
}
+ private double getAllAnfmeInAgvWrkDetlList(List<AgvWrkDetl> agvWrkDetlList, AgvWrkDetl wd0) {
+ double allAnfme = 0;
+ for (AgvWrkDetl wd1 : agvWrkDetlList){
+ if(Cools.eq(wd0.getMatnr(),wd1.getMatnr())
+ && Cools.eq(wd0.getBatch(),wd1.getBatch())
+ && Cools.eq(wd0.getThreeCode(),wd1.getThreeCode())
+ && Cools.eq(wd0.getDeadTime(),wd1.getDeadTime())){
+ allAnfme += wd1.getAnfme();
+ }
+ }
+ return allAnfme;
+ }
+
private void setFlagForAgvBasDevpDto(AgvWrkMast agvWrkMast, AgvBasDevpDto agvBasDevpDto){
//褰撳伐浣滄。绫诲瀷涓�101.鍑哄簱 骞朵笖 宸ヤ綔浣嶇姸鎬佷负F.鍦ㄥ簱鏃讹紝鏄剧ず瀹瑰櫒绂诲満鎸夐挳
if(agvWrkMast.getIoType() == 101 && "F".equals(agvBasDevpDto.getLocSts())){
--
Gitblit v1.9.1