#1

lsh

2024-05-31 c22edcc5e29212dfa3e7b629c45ba00c30f310f8

#1

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

@@ -421,7 +421,11 @@
        //生成工作档
        AgvWrkMast mast = new AgvWrkMast();
        //工作状态
        mast.setWrkSts(201L);
        if (ioType==121) {
            mast.setWrkSts(11L);
        }else {
            mast.setWrkSts(201L);
        }
        //入出库类型
        mast.setIoType(ioType);
        mast.setIoTime(now);
@@ -462,6 +466,7 @@
                }
            });
        }

        // 如果当前任务是箱壳二三楼回退一楼的 回滚调拨单
        if (ioType == 12 && locMast.getFloor() == 1) {
            List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));

 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java

@@ -71,14 +71,17 @@
            agvWrkMastService.updateById(agvWrkMast);
            // 空板入库 设置库位状态为D.空桶/空栈板
            String locSts = agvWrkMast.getIoType() == 10 ? "D" : "F";

            if (agvWrkMast.getIoType() != 111) {
                //生成AGV工作历史档
                agvWrkMastLogService.save(agvWrkMast);
                //生成AGV工作明细历史档
                agvWrkDetlLogService.save(wrkNo);
            }

            switch (agvWrkMast.getIoType()){
                case 10:
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());

                    //生成AGV工作历史档
                    agvWrkMastLogService.save(agvWrkMast);
                    //生成AGV工作明细历史档
                    agvWrkDetlLogService.save(wrkNo);
                    break;
                case 109:
                    // 库位 -- 接驳位 / 库位
@@ -88,12 +91,6 @@
                    } else {
                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                    }

                    //生成AGV工作历史档
                    agvWrkMastLogService.save(agvWrkMast);
                    //生成AGV工作明细历史档
                    agvWrkDetlLogService.save(wrkNo);

                    // 接驳位 -- 库位
                    if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
@@ -123,12 +120,6 @@
                    break;
                case 113:
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());

                    //生成AGV工作历史档
                    agvWrkMastLogService.save(agvWrkMast);
                    //生成AGV工作明细历史档
                    agvWrkDetlLogService.save(wrkNo);

                    // 接驳位 -- 库位
                    if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
@@ -179,9 +170,6 @@
                default:
                    return null;
            }



            if (agvWrkMast.getIoType() != 111) {
                //删除AGV工作档
                agvWrkMastService.deleteById(wrkNo);