From c8a3ec588628bdd3f223eb067cf0c35be687d98f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 14 十二月 2023 09:56:28 +0800
Subject: [PATCH] 可视化站点注释
---
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 be68977..38cc451 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()));
@@ -142,11 +143,15 @@
List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>()
.eq("supp_code", agvBasDevpDto.getBarcode()));
+ //濡傛灉鏈夊叆搴撻�氱煡妗ｏ紝鍒欒宸ヤ綔浣嶄负鍏ュ簱浣滀笟
if(!Cools.isEmpty(agvWaitPakinList)){
+ //鐢ㄤ簬鐢佃鏈烘樉绀�
agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
+ //鐢ㄤ簬鍙鍖栫珯鐐规樉绀�
agvBasDevpDto.setAgvWaitPakin(agvWaitPakinList.get(0));
}
+ //濡傛灉娌℃湁鍏ュ簱閫氱煡妗ｏ紝鍒欒宸ヤ綔浣嶄负鍑哄簱浣滀笟
if(Cools.isEmpty(agvWaitPakinList)){
List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
@@ -156,8 +161,8 @@
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){
@@ -167,7 +172,9 @@
}
if(!Cools.isEmpty(agvWrkDetlList)){
+ //鐢ㄤ簬鐢佃鏈烘樉绀�
agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
+ //鐢ㄤ簬鍙鍖栫珯鐐规樉绀�
agvBasDevpDto.setAgvWrkDetl(agvWrkDetlList.get(0));
}
--
Gitblit v1.9.1