可视化站点显示

zyx

2023-12-12 31c928cb167d386e6ef13fa5d0e583ef81725d7d

可视化站点显示

 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));
                        }

                    }
                }


 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;

 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>