From 7a8d6ce7fa5acb83b63d184229505113fa60f402 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 12 十二月 2023 19:55:13 +0800
Subject: [PATCH] #找库位V2拣料回库
---
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 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..e8146cd 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -138,26 +138,41 @@
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)){
+ //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绔欑偣鍙鍖栫鐞嗕腑鐨勭粨浣欐暟閲忔樉绀�
- 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);
+ //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());
+ }
+ if(agvWrkMast.getIoType() == 53){
+ AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
+ //AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getLocNo());
+ agvWrkDetl.setVolume(agvLocDetl.getAnfme());
+ //agvWrkDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.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);
+
}
}
--
Gitblit v1.9.1