agv可视化站点管理更新

zyx

2023-10-23 b1b7826369cc951eebb804c29ccb9c5dccc94b5e

agv可视化站点管理更新

 src/main/java/com/zy/asrs/service/AgvLocDetlService.java

@@ -28,4 +28,6 @@
     */
    boolean updateAnfme(Double anfme, String locNo, String matnr, String batch);

    public AgvLocDetl selectByLocNo(String locNo);

}

 src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java

@@ -1,17 +1,12 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvWaitPakin;
import com.zy.asrs.entity.AgvWrkDetl;
import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.AgvBasDevpMapper;
import com.zy.asrs.service.AgvBasDevpService;
import com.zy.asrs.service.AgvWaitPakinService;
import com.zy.asrs.service.AgvWrkDetlService;
import com.zy.asrs.service.AgvWrkMastService;
import com.zy.asrs.service.*;
import com.zy.common.model.AgvBasDevpDto;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +28,8 @@
    AgvWrkDetlService agvWrkDetlService;
    @Autowired
    AgvWaitPakinService agvWaitPakinService;
    @Autowired
    AgvLocDetlService agvLocDetlService;

    public void clearBasDevp(){
        agvBasDevpMapper.deleteAll();
@@ -99,9 +96,15 @@

        List<Map<String, Object>> body = new ArrayList<>();
        for(int i=3; i>=1; i--){
            List<AgvBasDevp> agvBasDevpList = this.selectList(new EntityWrapper<AgvBasDevp>()
            Wrapper<AgvBasDevp> wrapper = new EntityWrapper<AgvBasDevp>()
                    .eq("station_code", stationCode)
                    .like("dev_no","0"+ i +"@"));
                    .like("dev_no", "0" + i + "@");

            if("CS-305".equals(stationCode) || "CS-306".equals(stationCode) || "307".equals(stationCode)){
                wrapper.orderBy("dev_no",false);
            }

            List<AgvBasDevp> agvBasDevpList = this.selectList(wrapper);

            Map<String, Object> map = new HashMap<>();

@@ -129,7 +132,17 @@
                    if(Cools.isEmpty(agvWaitPakin)){
                        AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(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());
                        }
                        if(agvWrkMast.getIoType() == 53){
                            AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getLocNo());
                            agvWrkDetl.setVolume(agvLocDetl.getAnfme());
                            //agvWrkDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
                        }
                        agvBasDevpDto.setAgvWrkDetl(agvWrkDetl);
                    }
                }

 src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java

@@ -166,4 +166,8 @@
            wrapper.eq(column,condition);
        }
    }

    public AgvLocDetl selectByLocNo(String locNo){
        return this.selectOne(new EntityWrapper<AgvLocDetl>().eq("loc_no",locNo));
    }
}

 src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java

@@ -175,10 +175,10 @@
            //拣料入库
            if(ioType == 53){
                //修改工作党明细
                agvWrkDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
                agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>().eq("wrk_no",agvWrkDetl.getWrkNo()));
                //agvWrkDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
                //agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>().eq("wrk_no",agvWrkDetl.getWrkNo()));
                //修改库存信息
                agvLocDetl.setAnfme(agvWrkDetl.getAnfme());
                agvLocDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
                agvLocDetlService.update(agvLocDetl,new EntityWrapper<AgvLocDetl>().eq("loc_no",agvLocDetl.getLocNo()));
            }
            //修改库位信息

 src/main/webapp/views/agvBasDevpVisualized/basDevp.html

@@ -77,6 +77,9 @@
                    </div>
                    {{#if agvWaitPakin}}
                    <div style="padding-top: 10px;">
                        {{#if agvWaitPakin.orderNo}}
                        订单号：{{agvWaitPakin.orderNo}} </br>
                        {{/if}}
                        物料号：{{agvWaitPakin.matnr}} </br>
                        {{#if agvWaitPakin.batch}}
                        序列码：{{agvWaitPakin.batch}} </br>
@@ -94,12 +97,15 @@
                    {{/if}}
                    {{#if agvWrkDetl}}
                    <div style="padding-top: 10px;">
                        {{#if agvWrkDetl.orderNo}}
                        订单号：{{agvWrkDetl.orderNo}} </br>
                        {{/if}}
                        物料号：{{agvWrkDetl.matnr}} </br>
                        {{#if agvWrkDetl.batch}}
                        序列码：{{agvWrkDetl.batch}} </br>
                        {{/if}}
                        料箱码：{{agvWaitPakin.suppCode}} </br>
                        数量：{{agvWrkDetl.anfme}}
                        料箱码：{{agvWrkDetl.suppCode}} </br>
                        取货数量：{{agvWrkDetl.anfme}}      结余数量：{{agvWrkDetl.volume}}
                    </div>
                    {{/if}}
                </div>