#

tzsk

2024-04-28 6b87b1634b7a99b54ffcc98775839604cd06e6bf

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

@@ -78,7 +78,10 @@
        }
        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", wrkNo));
        if(Cools.isEmpty(agvWrkMast)){
            return R.error("任务编号错误");
            agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",param.getContainerCode()));
            if (Cools.isEmpty(agvWrkMast)){
                return R.error("任务编号错误");
            }
        }

        AgvTask agvTask = AgvTask.valueOf(param.getEventType());
@@ -114,8 +117,35 @@
    task{
        @Transactional
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

            //针对同一个料箱入库时产生两条不同目标库位的入库工作档
            if(agvWrkMast.getIoType() == 1 && !Cools.eq(agvWrkMast.getLocNo(),param.getLocationCode())){

                //查询新的工作档
                AgvWrkMast agvWrkMast1 = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
                        .eq("barcode", param.getContainerCode())
                        .eq("loc_no",param.getLocationCode()));

                if(!Cools.isEmpty(agvWrkMast1)){
                    //取消工作档
                    String locNo = agvWrkMast.getLocNo();
                    agvLocMastService.updateLocStsByLocNo(locNo,"O","");
                    agvWrkMastService.deleteByWrkNo(agvWrkMast.getWrkNo());
                    agvWrkDetlService.deleteByWrkNo(agvWrkMast.getWrkNo());

                    agvWrkMast = agvWrkMast1;
                }
            }


            //修改AGV工作档的工作状态为205.工作完成
            agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),205);
            agvWrkMast.setWrkSts(205L);
            if(param.getLocationCode().contains("@") && param.getLocationCode().contains("CS")){
                agvWrkMast.setLocNo(param.getLocationCode());
            }
            //agvWrkMast.setLocNo(param.getLocationCode());
            agvWrkMastService.updateById(agvWrkMast);
            //agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),205);

            //出库任务 101.出库 || 103.拣料出库 || 107.盘点出库
            if(agvWrkMast.getIoType() == 101 || agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107){
@@ -200,7 +230,11 @@
        @Transactional
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
            //修改工作档状态为204.放货完成
            agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),204);
            agvWrkMast.setWrkSts(204L);
            //agvWrkMast.setLocNo(param.getLocationCode());
            agvWrkMastService.updateById(agvWrkMast);
            //agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),204);

        }

        public void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {