自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
#
luxiaotao1123
2021-05-31 439452f59b03556aecc5dd6dbaa8f064b70cd026 
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java


@@ -14,8 +14,10 @@


import com.zy.asrs.service.*;


import com.zy.asrs.utils.VersionUtils;


import com.zy.common.model.LocDetlDto;


import com.zy.common.model.LocTypeDto;


import com.zy.common.model.OutLocDto;


import com.zy.common.model.StartupDto;


import com.zy.common.model.enums.WorkNoType;


import com.zy.common.service.CommonService;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


@@ -56,6 +58,8 @@


    private AdjDetlService adjDetlService;


    @Autowired


    private WrkMastLogService wrkMastLogService;


    @Autowired


    private WrkDetlLogService wrkDetlLogService;




    @Override


    @Transactional


@@ -66,11 +70,12 @@


        }


        // 源站点状态检测


        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo(), true);


        // 生成工作号


        int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);


        // 检索库位


        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);


        List<String> matNos = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatNo).distinct().collect(Collectors.toList());


        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matNos);


        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matNos, locTypeDto, 0);


        // 生成工作号


        int workNo = dto.getWorkNo();


        // 生成工作档


        WrkMast wrkMast = new WrkMast();


        wrkMast.setWrkNo(workNo);


@@ -144,7 +149,7 @@


        }


        if (!locDetlDtos.isEmpty()) {


            // 启动出库开始 101.出库


            stockOut(staNo, locDetlDtos, null, userId);


            stockOut(staNo, locDetlDtos, null, userId, null, false, null);


        } else {


            throw new CoolException("库位物料不存在");


        }


@@ -152,7 +157,7 @@




    @Override


    @Transactional


    public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, Integer ioType, Long userId) {


    public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, Integer ioType, Long userId, String allotNo, Boolean sell, Double more) {


        // 合并同类项


        Set<String> locNos = new HashSet<>();


        locDetlDtos.forEach(dto -> locNos.add(dto.getLocDetl().getLocNo()));


@@ -187,7 +192,7 @@


                throw new CoolException("出库路径不存在");


            }


            // 生成工作号


            int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);


            int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));


            // 生成工作档


            WrkMast wrkMast = new WrkMast();


            wrkMast.setWrkNo(workNo);


@@ -204,6 +209,9 @@


            wrkMast.setExitMk("N"); // 退出


            wrkMast.setEmptyMk("N"); // 空板


            wrkMast.setLinkMis("N");


            wrkMast.setPacked(allotNo); // 平仓补仓单号


            wrkMast.setPdcType(sell?"Y":"N"); // ERP销售订单出库任务


            wrkMast.setRefWrkno(more==null?0.0D:more);


            wrkMast.setAppeUser(userId); // 操作人员数据


            wrkMast.setAppeTime(new Date());


            wrkMast.setModiUser(userId);


@@ -249,22 +257,22 @@


    public String emptyPlateIn(Integer devpNo, Long userId) {


        // 源站点状态检测


        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);


        // 生成工作号


        int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);


        // 检索库位


        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null);


        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);


        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, locTypeDto, 0);


        int workNo = dto.getWorkNo();


        // 生成工作档


        WrkMast wrkMast = new WrkMast();


        wrkMast.setWrkNo(workNo);


        wrkMast.setIoTime(new Date());


        wrkMast.setWrkSts(1L); // 工作状态：生成入库ID


        wrkMast.setIoType(10); // 入出库状态：10.空板入库


        wrkMast.setIoPri(13D); // 优先级：10


        wrkMast.setIoPri(10D); // 优先级：10


        wrkMast.setCrnNo(dto.getCrnNo());


        wrkMast.setSourceStaNo(dto.getSourceStaNo());


        wrkMast.setStaNo(dto.getStaNo());


        wrkMast.setLocNo(dto.getLocNo());


        wrkMast.setFullPlt("N"); // 满板：Y


        wrkMast.setFullPlt("N"); // 满板


        wrkMast.setPicking("N"); // 拣料


        wrkMast.setExitMk("N"); // 退出


        wrkMast.setEmptyMk("Y"); // 空板


@@ -309,7 +317,7 @@


        }


        for (String locNo : param.getLocNos()) {


            // 获取工作号


            int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);


            int workNo = commonService.getWorkNo(WorkNoType.PAKOUT.type);


            // 获取库位


            LocMast locMast = locMastService.selectById(locNo);


            if (Cools.isEmpty(locMast)) {


@@ -380,7 +388,7 @@


        }


        if (!locDetlDtos.isEmpty()) {


            // 启动出库开始 107.盘点出库


            stockOut(staNo, locDetlDtos, 107, userId);


            stockOut(staNo, locDetlDtos, 107, userId, null, false, null);


        } else {


            throw new CoolException("库位物料不存在");


        }


@@ -401,7 +409,7 @@


            throw new CoolException("移转库位属于不同堆垛机");


        }


        // 获取工作号


        int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);


        int workNo = commonService.getWorkNo(WorkNoType.PICK.type);


        // 保存工作档


        WrkMast wrkMast = new WrkMast();


        wrkMast.setWrkNo(workNo);


@@ -488,6 +496,8 @@


        wrkMast.setCrnEndTime(now);


        wrkMast.setModiTime(now);


        wrkMast.setModiUser(userId);


        // 完成操作人员记录


        wrkMast.setManuType("手动完成");


        if (!wrkMastService.updateById(wrkMast)) {


            throw new CoolException("修改工作档失败");


        }


@@ -562,6 +572,15 @@


                }


            }


        }


        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", param.getLocNo()));


        if (locDetls.isEmpty()) {


            locMast.setLocSts("D");


            locMast.setModiUser(userId);


            locMast.setModiTime(new Date());


            if (!locMastService.updateById(locMast)) {


                throw new CoolException("更新库位状态失败");


            }


        }


    }




    @Override


@@ -618,10 +637,29 @@


        } else {


            throw new CoolException("当前工作状态无法取消");


        }


        // 删除工作档


        // 取消操作人员记录


        wrkMast.setManuType("手动取消");


        wrkMast.setModiUser(userId);


        wrkMast.setModiTime(new Date());


        if (!wrkMastService.updateById(wrkMast)) {


            throw new CoolException("取消工作档失败");


        }


        // 保存工作主档历史档


        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {


            throw new CoolException("保存工作历史档失败, workNo = " + wrkMast.getWrkNo());


        }


        // 删除工作主档


        boolean wrkMastRes = wrkMastService.deleteById(wrkMast);


        // 删除工作档明细


        boolean wrkDetlRes = wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", workNo));




        if (wrkMast.getIoType() != 10 && wrkMast.getIoType() != 110) {


            // 保存工作明细档历史档


            if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {


                throw new CoolException("保存工作明细历史档失败, workNo = " + wrkMast.getWrkNo());


            }


            // 删除工作档明细


            boolean wrkDetlRes = wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", workNo));


        }




        // 修改库位状态


        LocMast locMast = locMastService.selectById(locNo);


        if (Cools.isEmpty(locMast)) {


@@ -631,7 +669,7 @@


        locMast.setModiTime(new Date());


        locMast.setModiUser(userId);


        boolean locMastRes = locMastService.updateById(locMast);


        if (!wrkMastRes || !wrkDetlRes || !locMastRes) {


        if (!wrkMastRes || !locMastRes) {


            throw new CoolException("保存数据失败");


        }


    }


@@ -652,9 +690,9 @@


            throw new CoolException("当前工作状态无法进行操作");


        }


        // 保存工作明细档历史档


//        if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {


//            throw new CoolException("保存工作明细档历史档失败");


//        }


        if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {


            throw new CoolException("保存工作明细档历史档失败");


        }


        // 保存工作主档历史档


        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {


            throw new CoolException("保存工作主档历史档失败");