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/AgvBasDevpServiceImpl.java | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 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 310b62a..85f1aad 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -120,6 +120,7 @@
return agvBasDevpDto;
}
+ //涓�涓伐浣滀綅鍙兘浼氬搴斿涓伐浣滄。锛屾樉绀哄伐浣滅姸鎬佹渶澶х殑宸ヤ綔妗�
List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
.eq("loc_no", agvBasDevpDto.getDevNo())
.or().eq("source_loc_no",agvBasDevpDto.getDevNo()));
@@ -138,26 +139,49 @@
agvBasDevpDto.setAgvWrkMast(agvWrkMast);
if("F".equals(agvBasDevpDto.getLocSts()) || "R".equals(agvBasDevpDto.getLocSts())){
- AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectOne(new EntityWrapper<AgvWaitPakin>()
+ //AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectOne(new EntityWrapper<AgvWaitPakin>().eq("supp_code", agvBasDevpDto.getBarcode()));
+ List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>()
.eq("supp_code", agvBasDevpDto.getBarcode()));
- agvBasDevpDto.setAgvWaitPakin(agvWaitPakin);
+ //濡傛灉鏈夊叆搴撻�氱煡妗ｏ紝鍒欒宸ヤ綔浣嶄负鍏ュ簱浣滀笟
+ if(!Cools.isEmpty(agvWaitPakinList)){
+ //鐢ㄤ簬鐢佃鏈烘樉绀�
+ agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
+ //鐢ㄤ簬鍙鍖栫珯鐐规樉绀�
+ agvBasDevpDto.setAgvWaitPakin(agvWaitPakinList.get(0));
+ }
- if(Cools.isEmpty(agvWaitPakin)){
- AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(new EntityWrapper<AgvWrkDetl>().
- eq("wrk_no",agvWrkMast.getWrkNo()));
+ //濡傛灉娌℃湁鍏ュ簱閫氱煡妗ｏ紝鍒欒宸ヤ綔浣嶄负鍑哄簱浣滀笟
+ if(Cools.isEmpty(agvWaitPakinList)){
+ List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
+
//agv绔欑偣鍙鍖栫鐞嗕腑鐨勭粨浣欐暟閲忔樉绀�
- agvWrkDetl.setVolume(0.0);
- if(agvWrkMast.getIoType() == 103){
- AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getSourceLocNo());
- agvWrkDetl.setVolume(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
+ for(AgvWrkDetl agvWrkDetl : agvWrkDetlList){
+ agvWrkDetl.setVolume(0.0);
+ if(agvWrkMast.getIoType() == 103){
+ //瀵绘壘鏄惁鏈夌浉鍚岀墿鏂欑殑宸ヤ綔妗ｆ槑缁嗭紝骞惰繑鍥炴暟閲忎箣鍜�
+ 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.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
+ if(Cools.isEmpty(agvLocDetl)){
+ agvWrkDetl.setVolume(0.0);
+ }else {
+ agvWrkDetl.setVolume(agvLocDetl.getAnfme());
+ }
+ }
}
- if(agvWrkMast.getIoType() == 53){
- AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getLocNo());
- agvWrkDetl.setVolume(agvLocDetl.getAnfme());
- //agvWrkDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
+
+ if(!Cools.isEmpty(agvWrkDetlList)){
+ //鐢ㄤ簬鐢佃鏈烘樉绀�
+ agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
+ //鐢ㄤ簬鍙鍖栫珯鐐规樉绀�
+ agvBasDevpDto.setAgvWrkDetl(agvWrkDetlList.get(0));
}
- agvBasDevpDto.setAgvWrkDetl(agvWrkDetl);
+
}
}
@@ -179,6 +203,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