#

1

7 小时以前 955fef9ba80fda70582d926a2c6f2af527447bb5

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

@@ -125,10 +125,13 @@
            return R.error("高低检测信号不能为空");
        }
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
        BasDevp sourceStaNo = basDevpService.selectById(param.getSourceStaNo());
        if(sourceStaNo.getWrkNo() == 0 ){
            return R.error("站点工作号不存在");
        }
        sourceStaNo.setLocType1(param.getLocType1());
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);

        param.setIoType(10);
        StartupDto dto = null;
        switch (param.getIoType()) {
            case 1://满托盘入库
@@ -256,8 +259,7 @@
        }
        return workNo;
    }
    @PostMapping("/auto/、" +
            "TransplantingOut/v1")
    @PostMapping("/auto/TransplantingOut/v1")
    @ResponseBody
    public R autoTransplantingOut(@RequestBody TransplantWork transplantWork){
        // 源站点状态检测
@@ -362,13 +364,16 @@
    @Transactional
    public StartupDto startupFullPutStoreAgv(Integer devpNo, String barcode, LocTypeDto locTypeDto) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
//        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
//        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins.get(0));
        StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
        // 更新目标库位状态
        Date now = new Date();
        if(dto == null){
            throw new CoolException("未找到库位");
        }
        LocMast locMast = locMastService.selectById(dto.getLocNo());
        if (locMast.getLocSts().equals("O")){
            locMast.setLocSts("S"); // S.入库预约