#拣料盘点功能优化

lty

2 天以前 178d30a9b69598e82489d24b1da18b3b3ab0766b

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

@@ -10,6 +10,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.StatusParam;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
@@ -17,6 +18,8 @@
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.param.ApplyChangeEnd;
import com.zy.common.web.param.ErrorMsg;
import com.zy.common.web.param.SearchEmptyParam;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
@@ -82,8 +85,8 @@
        if (Cools.isEmpty(param.getCargoHeight())) {
            return Re.error("高低库类型不能为空");
        }
        if (Cools.isEmpty(param.getFromPort())) {
            return Re.error("源站编号不能为空");
        if (Cools.isEmpty(param.getFromPort()) && !param.getFromPort().equals("1001")) {
            return Re.error("入库站点编号错误:"+param.getFromPort());
        }
        if(Cools.isEmpty(param.getWarehouse())){
            return Re.error("仓库编号不能为空");
@@ -92,20 +95,32 @@
            return Re.error("仓库编号不匹配");
        }
        List<WaitPakin> waitPakins = null;
        if (param.getFromPort().equals("101")) {

        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarCode()));

        if(wrkMast != null && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107)){
            switch (wrkMast.getIoType()){
                case 103:param.setIoType(103);break;//拣料
                case 107:param.setIoType(107);break;//盘点
            }
        }else{
            //全板入库
            param.setIoType(1);
        }
        if (param.getFromPort().equals("1001") && param.getIoType()!=103 && param.getIoType() != 107) {

            //有空板出库时禁止入库
            int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", 100).notIn("wrk_sts", 7));
            int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", 1001).notIn("wrk_sts", 7));
            if(wrkCount > 0){
                return Re.error("有空板出库到100站时时禁止入库");
                return Re.error("有空板出库到1001站时时禁止入库");
            }

            if (Cools.isEmpty(param.getBarCode())) {
                return Re.error("条码不能为空");
            }
            waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarCode()));
            if (Cools.isEmpty(waitPakins) && param.getIoType() != 10) {
                WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarCode());
            if (Cools.isEmpty(waitPakins)) {
//                WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarCode());
                if (wrkMast != null && wrkMast.getIoType() == 103) {
                    return Re.parse(CodeRes.PICK_600);
                }
@@ -118,7 +133,7 @@
            }
        } else {
            //有满板出库时禁止空板入库
            int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", 100).andNew().eq("io_type", 101).or().eq("io_type", 110));
            int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", 1001).andNew().eq("io_type", 101).or().eq("io_type", 110));
            if (wrkCount > 0) {
                return Re.error("有满板出库时禁止空板入库");
            }
@@ -131,29 +146,37 @@
        if (Cools.isEmpty(param.getCargoHeight())) {
            return Re.error("高低检测信号不能为空");
        }
//        if (!param.getBarCode().startsWith("7")&&!param.getBarCode().startsWith("8")){
//            return Re.error("未定义的托盘码规则");
//        }

        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(Integer.valueOf(param.getFromPort()), true);
        sourceStaNo.setLocType1(param.getCargoHeight().shortValue());
        if(sourceStaNo == null){
            return Re.error("站点不存在");
        }
        sourceStaNo.setLocType1(param.getCargoHeight().shortValue()); // 高低库位
//        if (param.getBarCode().startsWith("7")){
//            sourceStaNo.setLocType2((short) 1); // 宽窄库位 1.窄库位1200*1000*990
//        }else if (param.getBarCode().startsWith("8")){
//            sourceStaNo.setLocType2((short) 2); // 宽窄库位 2.宽库位1200*1000*1270
//        }
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);

        StartupDto dto = null;

        //全板入库
        param.setIoType(1);

        switch (param.getIoType()) {
            case 1://满托盘入库
                assert waitPakins != null;
                dto = startupFullPutStore(Integer.valueOf(param.getFromPort()), param.getBarCode(), locTypeDto, waitPakins);
                break;
//            case 10://空托盘入库
//                dto = emptyPlateIn(Integer.valueOf(param.getFromPort()), locTypeDto, param.getBarCode());
//                break;
            case 103:startupFullPutStore103(Integer.valueOf(param.getFromPort()), param.getBarCode(), locTypeDto, wrkMast);break;
            case 107:startupFullPutStore107(Integer.valueOf(param.getFromPort()), param.getBarCode(), locTypeDto, wrkMast);break;
            default:
                break;
        }
        log.info("WCS入库接口返参:{},托盘码:{}", dto, param.getBarCode());
        log.info("WCS满板入库接口返参:{},托盘码:{}", dto, param.getBarCode());
        return Re.ok();
    }

@@ -168,15 +191,56 @@
            return Re.error("仓库编号不匹配");
        }

        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(Integer.valueOf(param.getFromPort()), true);
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
//        // 源站点状态检测
//        BasDevp sourceStaNo = basDevpService.checkSiteStatus(Integer.valueOf(param.getFromPort()), true);
        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1((short) 2);

        StartupDto dto = null;

        dto = emptyPlateIn(Integer.valueOf(param.getFromPort()), locTypeDto);
        log.info("WCS入库接口返参:{},托盘码:{}", dto);
        log.info("WCS空板入库接口返参:{}", dto);
        return Re.ok();
    }

    @PostMapping("/fromwcs/errorReport")
    @ResponseBody
    public synchronized Re errReport(@RequestBody ErrorMsg param){
        log.info("收到WCS任务入库异常上报===>>入参:{}",param);
        if(Cools.isEmpty(param.getWarehouse())){
            return Re.error("仓库编号不能为空");
        }
        if(!param.getWarehouse().equals(warehouse)){
            return Re.error("仓库编号不匹配");
        }
        return Re.ok();
    }

    @PostMapping("/fromwcs/applyChangeEnd")
    @ResponseBody
    public synchronized Re applyChangeEnd(@RequestBody ApplyChangeEnd param){
        log.info("收到WCS申请最终目的位置===>>入参:{}",param);
        if(Cools.isEmpty(param.getWarehouse())){
            return Re.error("仓库编号不能为空");
        }
        if(!param.getWarehouse().equals(warehouse)){
            return Re.error("仓库编号不匹配");
        }
        if (Cools.isEmpty(param.getTaskId())){
            return Re.error("任务编号不能为空");
        }
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getTaskId()));
        if (wrkMast == null){
            return Re.error("WMS不存在任务号:" + param.getTaskId() + "任务");
        }
        if (wrkMast.getIoType() > 100){
            return Re.error("任务号:" + param.getTaskId() + "是出库任务");
        }
        if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 5 || wrkMast.getWrkSts() == 14 || wrkMast.getWrkSts() == 15){
            return Re.error("任务号:" + param.getTaskId() + "已结束");
        }
        String targetNo = wrkMast.getLocNo();
        return Re.ok(targetNo);
    }


@@ -323,12 +387,153 @@
        return dto;
    }

    /**
     * 盘点入库
     */
    @Transactional
    public StartupDto startupFullPutStore107(Integer devpNo, String barcode, LocTypeDto locTypeDto, WrkMast wrkMast) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
        List<WrkDetl> wrkDetlList = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
        WrkDetl wrkDetl = wrkDetlList.get(0);
        findLocNoAttributeVo.setMatnr(wrkDetl.getMatnr());
        findLocNoAttributeVo.setBatch(wrkDetl.getBatch());
//        StartupDto dto = commonService.getLocNo(1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
        StartupDto dto = commonService.getLocNoNew(1, devpNo, findLocNoAttributeVo, locTypeDto,barcode);
        if (dto == null) {
            throw new CoolException("没有检索到空库位");
        }
        Date now = new Date();
        // 生成工作档
        try{
            // 保存工作明细档历史档
            if (wrkMastMapper.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
                throw new CoolException("保存工作明细档历史档失败");
            }
            // 保存工作主档历史档
            if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
                throw new CoolException("保存工作主档历史档失败");
            }
            // 更新工作档数据状态
            wrkMast.setIoTime(now);
            wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
            wrkMast.setWrkSts(0L); // 工作状态: 2.设备上走
            wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站
            wrkMast.setStaNo(dto.getStaNo()); // 目标站
            wrkMast.setLocNo(dto.getLocNo()); // 目标库位 = 出库时的源库位
            wrkMast.setSourceLocNo(""); // 源库位清空
            wrkMast.setModiTime(now);
            wrkMast.setMk("N");//是否完成上报wcs
            // 操作人员数据
            wrkMast.setAppeTime(now);
            wrkMast.setModiTime(now);
            if (wrkMastMapper.updateById(wrkMast) == 0) {
                throw new CoolException("更新工作档数据状态失败");
            }
            // 更新明细档io_time (历史档关联使用）
            wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);
            // 更新源站点信息
            sourceStaNo.setWrkNo(wrkMast.getWrkNo());
            sourceStaNo.setModiTime(now);
            if (!basDevpService.updateById(sourceStaNo)) {
                throw new CoolException("更新源站失败");
            }
            // 更新目标库位状态
            LocMast locMast = locMastService.selectById(dto.getLocNo());
            if (locMast.getLocSts().equals("O")) {
                locMast.setLocSts("Q"); // S.入库预约
                locMast.setModiTime(now);
                if (!locMastService.updateById(locMast)) {
                    throw new CoolException("改变库位状态失败");
                }
            } else {
                throw new CoolException(dto.getLocNo() + "目标库位已被占用");
            }
        } catch (Exception e) {
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        }
        return dto;
    }


    /**
     * 盘点入库
     */
    @Transactional
    public StartupDto startupFullPutStore103(Integer devpNo, String barcode, LocTypeDto locTypeDto, WrkMast wrkMast) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
        List<WrkDetl> wrkDetlList = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
        WrkDetl wrkDetl = wrkDetlList.get(0);
        findLocNoAttributeVo.setMatnr(wrkDetl.getMatnr());
        findLocNoAttributeVo.setBatch(wrkDetl.getBatch());
//        StartupDto dto = commonService.getLocNo(1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
        StartupDto dto = commonService.getLocNoNew(1, devpNo, findLocNoAttributeVo, locTypeDto,barcode);
        if (dto == null) {
            throw new CoolException("没有检索到空库位");
        }
        Date now = new Date();
        // 生成工作档
        try{
            // 保存工作明细档历史档
            if (wrkMastMapper.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
                throw new CoolException("保存工作明细档历史档失败");
            }
            // 保存工作主档历史档
            if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
                throw new CoolException("保存工作主档历史档失败");
            }
            // 更新工作档数据状态
            wrkMast.setIoTime(now);
            wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
            wrkMast.setWrkSts(0L); // 工作状态: 2.设备上走
            wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站
            wrkMast.setStaNo(dto.getStaNo()); // 目标站
            wrkMast.setLocNo(dto.getLocNo()); // 目标库位 = 出库时的源库位
            wrkMast.setSourceLocNo(""); // 源库位清空
            wrkMast.setModiTime(now);
            wrkMast.setMk("N");//是否完成上报wcs
            // 操作人员数据
            wrkMast.setAppeTime(now);
            wrkMast.setModiTime(now);
            if (wrkMastMapper.updateById(wrkMast) == 0) {
                throw new CoolException("更新工作档数据状态失败");
            }
            // 更新明细档io_time (历史档关联使用）
            wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);
            // 更新源站点信息
            sourceStaNo.setWrkNo(wrkMast.getWrkNo());
            sourceStaNo.setModiTime(now);
            if (!basDevpService.updateById(sourceStaNo)) {
                throw new CoolException("更新源站失败");
            }
            // 更新目标库位状态
            LocMast locMast = locMastService.selectById(dto.getLocNo());
            if (locMast.getLocSts().equals("O")) {
                locMast.setLocSts("Q"); // S.入库预约
                locMast.setModiTime(now);
                if (!locMastService.updateById(locMast)) {
                    throw new CoolException("改变库位状态失败");
                }
            } else {
                throw new CoolException(dto.getLocNo() + "目标库位已被占用");
            }
        } catch (Exception e) {
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        }
        return dto;
    }

    @Transactional
    public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        StartupDto dto = commonService.getLocNo(10, devpNo, null, null, null, locTypeDto);
        StartupDto dto = commonService.getLocNoNew(10, devpNo, null, null, null);
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -396,41 +601,44 @@
         */

        if (statusParam.getTaskStatus() == 0) {
            //拣料和盘点再入库判断
            if ((wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) && wrkMast.getWrkSts() == 14) {
                List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                String sourcecLocNo = wrkMast.getSourceLocNo();
                // 获取后两位的层数（高低库位数据）
                String layerStr = sourcecLocNo.substring(sourcecLocNo.length() - 2);
                int layer = Integer.parseInt(layerStr);
                // 判断层数
                Short locType1 = (short) ((layer == 1) ? 1 : 2);
                LocTypeDto locTypeDto = new LocTypeDto();
                locTypeDto.setLocType1(locType1);
                //注意一个板只能放同一种物料（检索新库位）
                StartupDto dto = commonService.getLocNoRunPick(4, 1, 101, wrkDetls.get(0).getMatnr(), wrkDetls.get(0).getBatch(), null, 4, locTypeDto, 2);
                Date now = new Date();
                wrkMast.setIoTime(now);
                wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
//            //拣料和盘点再入库判断
//            if ((wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) && wrkMast.getWrkSts() == 14) {
//                List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
//                String sourcecLocNo = wrkMast.getSourceLocNo();
//                // 获取后两位的层数（高低库位数据）
//                String layerStr = sourcecLocNo.substring(sourcecLocNo.length() - 2);
//                int layer = Integer.parseInt(layerStr);
//                // 判断层数
//                Short locType1 = (short) ((layer == 1) ? 1 : 2);
//                LocTypeDto locTypeDto = new LocTypeDto();
//                locTypeDto.setLocType1(locType1);
//                //注意一个板只能放同一种物料（检索新库位）
////                StartupDto dto = commonService.getLocNoRunPick(4, 1, 101, wrkDetls.get(0).getMatnr(), wrkDetls.get(0).getBatch(), null, 4, locTypeDto, 2);
//                FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
//                findLocNoAttributeVo.setMatnr(wrkDetls.get(0).getMatnr());
//                StartupDto dto = commonService.getLocNoNew(1, 101, findLocNoAttributeVo,locTypeDto,null);
//                Date now = new Date();
//                wrkMast.setIoTime(now);
//                wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
//                wrkMast.setWrkSts(1L);//1.已接收
//                wrkMast.setSourceStaNo(101); // 源站
//                wrkMast.setStaNo(null); // 目标站
//                wrkMast.setLocNo(dto.getLocNo()); // 目标库位
//                wrkMast.setSourceLocNo(sourcecLocNo);
//                wrkMast.setModiTime(now);
//                wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);
//
//                // 修改库位状态 Q.拣料/盘点/并板再入库
//                LocMast locMast2 = locMastService.selectById(dto.getLocNo());
//                locMast2.setLocSts("Q");
//                locMast2.setModiTime(new Date());
//                if (!locMastService.updateById(locMast2)) {
//
//                    throw new CoolException("修改库位状态失败");
//                }
//            } else {
                wrkMast.setWrkSts(1L);//1.已接收
                wrkMast.setSourceStaNo(101); // 源站
                wrkMast.setStaNo(null); // 目标站
                wrkMast.setLocNo(dto.getLocNo()); // 目标库位
                wrkMast.setSourceLocNo(sourcecLocNo);
                wrkMast.setModiTime(now);
                wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);

                // 修改库位状态 Q.拣料/盘点/并板再入库
                LocMast locMast2 = locMastService.selectById(dto.getLocNo());
                locMast2.setLocSts("Q");
                locMast2.setModiTime(new Date());
                if (!locMastService.updateById(locMast2)) {

                    throw new CoolException("修改库位状态失败");
                }
            } else {
                wrkMast.setWrkSts(1L);//1.已接收
            }
//            }
        } else if (statusParam.getTaskStatus() == 1) {
            wrkMast.setWrkSts(2L);//2.任务开始
        } else if (statusParam.getTaskStatus() == 2) {
@@ -469,21 +677,21 @@
            } else if ((wrkMast.getIoType() == 101 || wrkMast.getIoType() == 110) && statusParam.getTaskStatus() != 8) {
                wrkMast.setWrkSts(7L);//7.出库完成
            } else if (wrkMast.getWrkSts() == 7 && statusParam.getTaskStatus() == 8){
                wrkMast.setWrkSts(15L);//15.出库更新完成，任务结束
                wrkMast.setWrkSts(14L);//15.出库更新完成，任务结束
            }
        }
        wrkMastService.updateById(wrkMast);
        //已入库未确认历史档更新
        if(wrkMast.getWrkSts() == 14){
            // 保存工作主档历史档
            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
                throw new CoolException("保存工作历史档失败");
            }
            // 保存工作明细档历史档
            if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
                throw new CoolException("保存工作明细历史档失败");
            }
        }
//        //已入库未确认历史档更新
//        if(wrkMast.getWrkSts() == 14 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107)){
//            // 保存工作主档历史档
//            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
//                throw new CoolException("保存工作历史档失败");
//            }
//            // 保存工作明细档历史档
//            if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
//                throw new CoolException("保存工作明细历史档失败");
//            }
//        }
        return Re.ok();
    }

@@ -499,7 +707,7 @@
                map.put("posiY", locMast.getBay1());
                map.put("posiZ", locMast.getLev1());
                map.put("cargoNo", locMast.getLocNo());
                if(locMast.getLev1() == 1 && locMast.getRow1() == 8 && locMast.getBay1() == 1){
                if(locMast.getLev1() == 1 && locMast.getRow1() == 6 && locMast.getBay1() == 1){
                    map.put("type", "6");
                }else {
                    map.put("type", "0");
@@ -543,17 +751,17 @@
                    success = true;
                } else {
                    log.error("wms同步wcs库位失败！！！url：{}；request：{}；response：{}", url + "/" + loc, JSON.toJSONString(mapList), response);
                    throw new CoolException("wms下发任务给wcs失败");
                    throw new CoolException("wms同步wcs库位失败");
                }
            } catch (Exception e) {
                log.error("fail", e);
//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                throw new CoolException("wms下发任务给wcs失败");
                throw new CoolException("wms同步wcs库位失败");
            } finally {
                try {
                    // 保存接口日志
                    apiLogService.save(
                            "wms同步wcs库位失败",
                            "wms同步wcs库位",
                            url + "/" + loc,
                            null,
                            "127.0.0.1",