#流程修改

LSH

2023-09-08 89344984d80ff1652abbd1de0ef12977b652e2a4

#流程修改

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

@@ -260,7 +260,7 @@


    /**
     * 中控：码垛完成下发入库信息
     * 中控：码垛完成下发入库信息  测试1
     */
    @PostMapping("/cs1/auth/v1")
    @AppAuth(memo = "中控：码垛前上报条码,生成测试工作档")
@@ -273,7 +273,7 @@
    }

    /**
     * 中控：码垛完成下发入库信息
     * 中控：码垛完成下发入库信息  测试2
     */
    @PostMapping("/cs2/auth/v1")
    @AppAuth(memo = "中控：码垛完成下发入库信息,生成测试工作档")
@@ -286,7 +286,7 @@
    }

    /**
     * 中控：码垛完成下发入库信息
     * 中控：码垛完成下发入库信息  测试3
     */
    @PostMapping("/cs3/auth/v1")
    @AppAuth(memo = "中控：码垛完成下发入库信息,生成测试工作档")

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

@@ -723,14 +723,6 @@
//        }


        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type",201).eq("barcode", param.getBarcode()).eq("sta_no",param.getDevNo$()));
        if (Cools.isEmpty(wrkMast) || !wrkMast.getWrkSts().equals(42L)){
            throw new CoolException("查询托盘失败");
        }else {
            wrkMast.setWrkSts(wrkMast.getWrkSts()+1);
        }


        if (locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()))!=0
            || wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()))!=0
            || waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()))!=0){
@@ -762,9 +754,6 @@
            if (!waitPakinService.insert(waitPakin)) {
                throw new CoolException("保存入库通知档失败");
            }
        }
        if (!wrkMastService.updateById(wrkMast)){
            throw new CoolException("异常，请重新申请");
        }

    }

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

@@ -33,7 +33,7 @@
public class BarcodeUploadHandler extends AbstractHandler<String> {

    @Autowired
    private WrkMastService wrkMastService;
    private WaitPakinService waitPakinService;
    @Autowired
    private LocMastService locMastService;
    @Autowired
@@ -53,20 +53,16 @@
    public ReturnT<String> start(int staNo) {
        try {
            BasDevp basDevp = basDevpService.selectById(staNo);
            if (!Cools.isEmpty(basDevp) && basDevp.getWrkNo()!=0){
                WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
                if (!Cools.isEmpty(wrkMast) && wrkMast.getIoType().equals(201) && wrkMast.getWrkSts().equals(41L)){
            if (!Cools.isEmpty(basDevp) && !Cools.isEmpty(basDevp.getBarcode()) && basDevp.getWrkNo()==9992){
                WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", basDevp.getBarcode()));
                if (Cools.isEmpty(waitPakin)){
                    ReturnT<String> result = null;
                    result = postMesData(barcodeUploadpath,wrkMast);
                    result = postMesData(barcodeUploadpath,basDevp);
                    System.out.println(result);
                    if (result.getCode()==200){
                        wrkMast.setWrkSts(42L);
                        // 修改订单状态 41. ===>> 42.已上报
                        if (!wrkMastService.updateById(wrkMast)) {
                            throw new CoolException("服务器内部错误，请联系管理员:更新工作号"+wrkMast.getWrkNo()+"工作档状态41==》42失败");
                        }else {
                            return SUCCESS;
                        }
                        return SUCCESS;
                    }else {
                        log.error("条码上传中控失败");
                    }
                }
            }

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

@@ -99,9 +99,9 @@
            case 10://空托盘入库
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
                break;
            case 201://自动补空板任务
                dto = emptyPlateIn201(param.getSourceStaNo(), locTypeDto, param.getBarcode());
                break;
//            case 201://自动补空板任务
//                dto = emptyPlateIn201(param.getSourceStaNo(), locTypeDto, param.getBarcode());
//                break;
            default:
                break;
        }
@@ -293,52 +293,53 @@
    /*...........................徐工汉云..............以下.............上饶江铜...........................*/
    /*............................Created by Monkey D. Luffy on 2023.07.19.............................*/

    @Transactional
    public StartupDto emptyPlateIn201(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        StartupDto dto =  commonService.getScanBarcodeEmptyBoard();
        if (dto.getStaNo()==0){
            return null;
        }
        Date now = new Date();
        dto.setSourceStaNo(devpNo);
        int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(201));
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(new Date());
        wrkMast.setWrkSts(41L); // 工作状态：前往码垛位
        wrkMast.setIoType(201); // 入出库状态：201、自动补空板
        wrkMast.setIoPri(13D); // 优先级
        wrkMast.setCrnNo(0);
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo("");
        wrkMast.setFullPlt("N"); // 满板
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("Y"); // 空板
        wrkMast.setLinkMis("Y");
        wrkMast.setBarcode(barcode);
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);

        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
        }
        // 更新源站点信息
        sourceStaNo.setWrkNo(workNo);
        sourceStaNo.setModiTime(now);
        if (!basDevpService.updateById(sourceStaNo)){
            throw new CoolException("更新源站失败");
        }
        return dto;
    }
    //    201、自动补空板
//    @Transactional
//    public StartupDto emptyPlateIn201(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
//        // 源站点状态检测
//        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
//        // 检索库位
//        StartupDto dto =  commonService.getScanBarcodeEmptyBoard();
//        if (dto.getStaNo()==0){
//            return null;
//        }
//        Date now = new Date();
//        dto.setSourceStaNo(devpNo);
//        int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(201));
//        // 生成工作档
//        WrkMast wrkMast = new WrkMast();
//        wrkMast.setWrkNo(workNo);
//        wrkMast.setIoTime(new Date());
//        wrkMast.setWrkSts(41L); // 工作状态：前往码垛位
//        wrkMast.setIoType(201); // 入出库状态：201、自动补空板
//        wrkMast.setIoPri(13D); // 优先级
//        wrkMast.setCrnNo(0);
//        wrkMast.setSourceStaNo(dto.getSourceStaNo());
//        wrkMast.setStaNo(dto.getStaNo());
//        wrkMast.setLocNo("");
//        wrkMast.setFullPlt("N"); // 满板
//        wrkMast.setPicking("N"); // 拣料
//        wrkMast.setExitMk("N"); // 退出
//        wrkMast.setEmptyMk("Y"); // 空板
//        wrkMast.setLinkMis("Y");
//        wrkMast.setBarcode(barcode);
//        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
//        // 操作人员数据
//        wrkMast.setAppeTime(now);
//        wrkMast.setModiTime(now);
//
//        boolean res = wrkMastService.insert(wrkMast);
//        if (!res) {
//            throw new CoolException("保存工作档失败");
//        }
//        // 更新源站点信息
//        sourceStaNo.setWrkNo(workNo);
//        sourceStaNo.setModiTime(now);
//        if (!basDevpService.updateById(sourceStaNo)){
//            throw new CoolException("更新源站失败");
//        }
//        return dto;
//    }
    /*...........................上饶江铜..............以上.............徐工汉云...........................*/