Changes

tzsk

2024-02-07 2cffc71ef5964efcdf5ea2dead4fb8a582688d4c

Changes

 src/main/java/com/zy/asrs/controller/AgvOpenController.java

@@ -119,7 +119,7 @@
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
            //修改AGV工作档的工作状态为205.工作完成
            agvWrkMast.setWrkSts(205L);
            agvWrkMast.setLocNo(param.getLocationCode());
            //agvWrkMast.setLocNo(param.getLocationCode());
            agvWrkMastService.updateById(agvWrkMast);
            //agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),205);


 src/main/java/com/zy/common/web/WcsController.java

@@ -644,10 +644,10 @@
        String currentContainerCode = currentContainerMap.get(devNo);

        //判断容器是否发生变化
        if(!Cools.eq(containerCode,currentContainerCode)){
        if(!Cools.isEmpty(currentContainerCode) && !Cools.eq(containerCode,currentContainerCode)){
            //查询旧容器的工作档
            AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(currentContainerCode);
            if(Cools.isEmpty(agvWrkMast) && agvWrkMast.getIoType() == 101){
            if(!Cools.isEmpty(agvWrkMast) && agvWrkMast.getIoType() == 101){
                //发送容器立场请求，完成工作档
                List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
                agvWrkMastList.add(agvWrkMast);
@@ -682,7 +682,7 @@
        //查找该容器的工作档
        AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
        if(!Cools.isEmpty(agvWrkMast)){
            return R.ok(agvWrkDetlService.selectByWrkNo(agvWrkMast.getWrkNo()));
            return R.ok(agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",agvWrkMast.getWrkNo())));
        }
        //查找该容器的入库通知档
        List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", containerCode));