From 31c928cb167d386e6ef13fa5d0e583ef81725d7d Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期二, 12 十二月 2023 17:25:37 +0800 Subject: [PATCH] 可视化站点显示 --- src/main/webapp/views/agvBasDevpVisualized/basDevp.html | 32 ++++++++++++++++---------------- src/main/java/com/zy/common/model/AgvBasDevpDto.java | 4 ++++ src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 16 ++++++++++++---- 3 files changed, 32 insertions(+), 20 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..e8146cd 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java @@ -142,7 +142,10 @@ 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())); @@ -151,20 +154,25 @@ //agv绔欑偣鍙鍖栫鐞嗕腑鐨勭粨浣欐暟閲忔樉绀� for(AgvWrkDetl agvWrkDetl : agvWrkDetlList){ agvWrkDetl.setVolume(0.0); - AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getSourceLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime()); + //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()); + 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()); } } - agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList); + if(!Cools.isEmpty(agvWrkDetlList)){ + agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList); + agvBasDevpDto.setAgvWrkDetl(agvWrkDetlList.get(0)); + } + } } diff --git a/src/main/java/com/zy/common/model/AgvBasDevpDto.java b/src/main/java/com/zy/common/model/AgvBasDevpDto.java index 5d9a130..43c7a7b 100644 --- a/src/main/java/com/zy/common/model/AgvBasDevpDto.java +++ b/src/main/java/com/zy/common/model/AgvBasDevpDto.java @@ -16,8 +16,12 @@ private AgvWrkMast agvWrkMast; + private AgvWaitPakin agvWaitPakin; + private List<AgvWaitPakin> agvWaitPakins; + private AgvWrkDetl agvWrkDetl; + private List<AgvWrkDetl> agvWrkDetls; private boolean containerMoveOutFlag; diff --git a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html index 9de3dc1..8ef19c0 100644 --- a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html +++ b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html @@ -75,17 +75,17 @@ 宸ヤ綔绔欑紪鐮侊細{{devNo}} </br> 绔欑偣鐘舵�侊細{{locSts$}} </div> - {{#if agvWaitPakins}} + {{#if agvWaitPakin}} <div style="padding-top: 10px;"> - {{#if agvWaitPakins[0].orderNo}} - 璁㈠崟鍙凤細{{agvWaitPakins[0].orderNo}} </br> + {{#if agvWaitPakin.orderNo}} + 璁㈠崟鍙凤細{{agvWaitPakin.orderNo}} </br> {{/if}} - 鐗╂枡鍙凤細{{agvWaitPakins[0].matnr}} </br> - {{#if agvWaitPakins[0].batch}} - 搴忓垪鐮侊細{{agvWaitPakins[0].batch}} </br> + 鐗╂枡鍙凤細{{agvWaitPakin.matnr}} </br> + {{#if agvWaitPakin.batch}} + 搴忓垪鐮侊細{{agvWaitPakin.batch}} </br> {{/if}} - 鏂欑鐮侊細{{agvWaitPakins[0].suppCode}} </br> - 鏁伴噺锛歿{agvWaitPakins[0].anfme}} + 鏂欑鐮侊細{{agvWaitPakin.suppCode}} </br> + 鏁伴噺锛歿{agvWaitPakin.anfme}} </div> {{/if}} {{#if agvWrkMast}} @@ -95,17 +95,17 @@ 宸ヤ綔绫诲瀷锛歿{agvWrkMast.ioType$}} </div> {{/if}} - {{#if agvWrkDetls}} + {{#if agvWrkDetl}} <div style="padding-top: 10px;"> - {{#if agvWrkDetls[0].orderNo}} - 璁㈠崟鍙凤細{{agvWrkDetls[0].orderNo}} </br> + {{#if agvWrkDetl.orderNo}} + 璁㈠崟鍙凤細{{agvWrkDetl.orderNo}} </br> {{/if}} - 鐗╂枡鍙凤細{{agvWrkDetls[0].matnr}} </br> - {{#if agvWrkDetls[0].batch}} - 搴忓垪鐮侊細{{agvWrkDetls[0].batch}} </br> + 鐗╂枡鍙凤細{{agvWrkDetl.matnr}} </br> + {{#if agvWrkDetl.batch}} + 搴忓垪鐮侊細{{agvWrkDetl.batch}} </br> {{/if}} - 鏂欑鐮侊細{{agvWrkDetls[0].suppCode}} </br> - 鍙栬揣鏁伴噺锛歿{agvWrkDetls[0].anfme}} 缁撲綑鏁伴噺锛歿{agvWrkDetls[0].volume}} + 鏂欑鐮侊細{{agvWrkDetl.suppCode}} </br> + 鍙栬揣鏁伴噺锛歿{agvWrkDetl.anfme}} 缁撲綑鏁伴噺锛歿{agvWrkDetl.volume}} </div> {{/if}} </div> -- Gitblit v1.9.1