#

1

2 天以前 c63696bec5666ad3064dd72636420e3980ade34f

 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 && sourceStaNo.getDevNo() != 2033){
            return R.error("站点工作号不存在");
        }
        sourceStaNo.setLocType1(param.getLocType1());
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);

        param.setIoType(10);
        StartupDto dto = null;
        switch (param.getIoType()) {
            case 1://满托盘入库
@@ -256,14 +259,13 @@
        }
        return workNo;
    }
    @PostMapping("/auto/、" +
            "TransplantingOut/v1")
    @PostMapping("/auto/TransplantingOut/v1")
    @ResponseBody
    public R autoTransplantingOut(@RequestBody TransplantWork transplantWork){
        // 源站点状态检测
//        BasDevp sourceStaNo = basDevpService.checkSiteStatus(transplantWork.getStaNo(), true);
        WrkMast wrkMast1 = wrkMastService.selectWrkMast(transplantWork.getWorkNo(),transplantWork.getBarcode());
//        if(sourceStaNo ==null ){
//        if(sourceStaNo ==null )hnagbao1{
//            return R.error("该站点盘点移栽许可，请查看源站点状态检测");
//        }
        if(wrkMast1== null){
@@ -362,7 +364,7 @@
    @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));