盘点出库增加一个标记 可筛选可清除

chen.lin

4 天以前 055743022694b6fc1bb1864137e0c81b6ea658c5

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

@@ -1,18 +1,21 @@
package com.zy.common.web;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
import com.zy.common.service.CommonService;
import com.zy.common.web.param.SearchLocParam;
import com.zy.common.web.param.TransferLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -21,7 +24,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
 * Created by vincent on 2020/10/30
@@ -44,11 +46,17 @@
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private  LocDetlService locDetlService;
    private LocDetlService locDetlService;
    @Autowired
    private RowLastnoService rowLastnoService;
    @Autowired
    private WorkService workService;
    @Autowired
    private WrkMastLogService wrkMastLogService;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private SlaveProperties slaveProperties;

    @PostMapping("/pakin/loc/v1")
    @ResponseBody
@@ -73,13 +81,13 @@
                }
                return R.parse(CodeRes.NO_COMB_700);
            }
            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
            int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
            int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
            if (countLoc > 0 || countWrk > 0) {
                return R.error(CodeRes.EXIST_500);
            }
        }
        if (Cools.isEmpty(param.getLocType1())){
        if (Cools.isEmpty(param.getLocType1())) {
            return R.error("高低检测信号不能为空");
        }

@@ -87,6 +95,15 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
        sourceStaNo.setLocType1(param.getLocType1());
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        if (param.getBarcode().startsWith("11")) {
            locTypeDto.setLocType2((short) 1);
        } else if (param.getBarcode().startsWith("13")) {
            locTypeDto.setLocType2((short) 2);
        } else if (param.getBarcode().startsWith("16")) {
            locTypeDto.setLocType2((short) 3);
        } else {
            return R.error("未知托盘码规则");
        }

        StartupDto dto = null;
        switch (param.getIoType()) {
@@ -104,14 +121,59 @@
        return R.ok().add(dto);
    }

    @PostMapping("/pakin/pick/loc/v1")
    @ResponseBody
    public synchronized R getPickLocNo(@RequestBody SearchLocParam param) {
        log.info("收到WCS拣料盘点入库接口请求====>>入参:{}", param);

        if (Cools.isEmpty(param.getSourceStaNo())) {
            return R.error("源站编号不能为空");
        }

        if (Cools.isEmpty(param.getLocType1())) {
            return R.error("高低检测信号不能为空");
        }

        if (Cools.isEmpty(param.getBarcode())) {
            return R.error("托盘码不存在");
        }

        StartupDto dto = startupPickPutStore(param);
        log.info("WCS拣料盘点入库接口,托盘码:{}", param.getBarcode());
        return R.ok().add(dto);
    }

    @PostMapping("/transfer/loc/v1")
    @ResponseBody
    public synchronized R transferLocV1(@RequestBody TransferLocParam param) {
        log.info("收到WCS申请移库接口请求====>>入参:{}", param);
        if (Cools.isEmpty(param.getLocNo())) {
            return R.error("库位号不存在");
        }

        if (Cools.isEmpty(param.getLane())) {
            return R.error("巷道号不存在");
        }

        try {
            transferLoc(param.getLocNo(), param.getLane());
            return R.ok();
        } catch (Exception e) {
            e.printStackTrace();
            return R.error(e.getMessage());
        }
    }

    @PostMapping("/auto/emptyIn/v1")
    @ResponseBody
    public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto){
    public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);

        // 检索库位
        StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 12, null, locTypeDto,0);
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();

        StartupDto dto = commonService.getLocNo(10, 12, findLocNoAttributeVo, locTypeDto, null);
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -134,12 +196,12 @@
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        wrkMast.setMemo("自动空托入库");
        return wrkMastService.insert(wrkMast) ? R.ok("自动空托入库成功,工作号:"+wrkMast.getWrkNo()) : R.error("生成自动空托入库失败");
        return wrkMastService.insert(wrkMast) ? R.ok("自动空托入库成功,工作号:" + wrkMast.getWrkNo()) : R.error("生成自动空托入库失败");
    }

    @PostMapping("auto/emptyOut/v1")
    @ResponseBody
    public R autoEmptyOut(){
    public R autoEmptyOut() {
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                .eq("loc_sts", "D"));
        if (Cools.isEmpty(locMast)) {
@@ -147,9 +209,146 @@
        }
        EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
        emptyPlateOutParam.setOutSite(12);
        emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locMast.getLocNo()+"");}});
        emptyPlateOutParam.setLocNos(new ArrayList<String>() {{
            add(locMast.getLocNo() + "");
        }});
        WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam);
        return R.ok(!Cools.isEmpty(wrkMast)? R.ok("自动空托出库成功,工作号:" + wrkMast.getWrkNo()) : R.error("生成自动空托出库失败"));
        return R.ok(!Cools.isEmpty(wrkMast) ? R.ok("自动空托出库成功,工作号:" + wrkMast.getWrkNo()) : R.error("生成自动空托出库失败"));
    }

    @Transactional
    public StartupDto startupPickPutStore(SearchLocParam param) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.selectById(param.getSourceStaNo());
        sourceStaNo.setLocType1(param.getLocType1());
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        if (param.getBarcode().startsWith("11")) {
            locTypeDto.setLocType2((short) 1);
        } else if (param.getBarcode().startsWith("13")) {
            locTypeDto.setLocType2((short) 2);
        } else if (param.getBarcode().startsWith("16")) {
            locTypeDto.setLocType2((short) 3);
        } else {
            throw new CoolException("未知托盘码规则");
        }

        WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
        if (wrkMast == null) {
            throw new CoolException(param.getBarcode() + "托盘，任务不存在");
        }

        if (wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {
            StartupDto dto = new StartupDto();
            dto.setWorkNo(wrkMast.getWrkNo());
            dto.setStaNo(wrkMast.getStaNo());
            return dto;
        }

        if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107) {
            throw new CoolException(wrkMast.getWrkNo() + "工作号，任务不属于拣选盘点");
        }

        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
        if (wrkDetls.isEmpty()) {
            throw new CoolException(wrkMast.getWrkNo() + "工作号，工作明细不存在");
        }

        WrkDetl wrkDetl = wrkDetls.get(0);
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
        findLocNoAttributeVo.setMatnr(wrkDetl.getMatnr());

        int ioType = wrkMast.getIoType() - 50; // 入出库类型: 103->53,104->54,107->57

        StartupDto dto = commonService.getLocNo(ioType, param.getSourceStaNo(), findLocNoAttributeVo, locTypeDto, param.getBarcode());
        if (dto == null) {
            throw new CoolException("找不到空库位");
        }

        // 保存工作主档历史档
        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
            throw new CoolException("保存工作主档历史档失败");
        }

        // 保存工作明细档历史档
        if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
            throw new CoolException("保存工作明细档历史档失败");
        }

        Date now = new Date();
        // 更新工作档数据状态
        wrkMast.setIoType(ioType); // 入出库类型: 103->53,104->54,107->57
        wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
        wrkMast.setCrnNo(dto.getCrnNo());
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setBarcode(param.getBarcode()); // 托盘码
        wrkMast.setModiTime(now);
        if(wrkMast.getIoType()==57){
            wrkMast.setMk("Y");
        }
        wrkMast.setUpdMk("");//允许再次移库
        if (!wrkMastService.updateById(wrkMast)) {
            throw new CoolException("更新工作档数据状态失败");
        }

        LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
        if (!locMast.getLocSts().equals("O")) {
            throw new CoolException(locMast.getLocNo() + "库位状态不处于空库位");
        }

        // 修改库位状态 Q.拣料/盘点/并板再入库
        locMast.setLocSts("Q");
        locMast.setMk(wrkMast.getMk());
        locMast.setModiTime(new Date());
        if (!locMastService.updateById(locMast)) {
            throw new CoolException("修改库位状态失败");
        }

        LocMast sourceLocMast = locMastService.selectById(wrkMast.getSourceLocNo());
        if (!sourceLocMast.getLocSts().equals("P")) {
            throw new CoolException(sourceLocMast.getLocNo() + "库位状态不处于P.拣料盘点出库");
        }

//        locMast.setMk(sourceLocMast.getMk());
//        if (!locMastService.updateById(locMast)) {
//            throw new CoolException("修改是否盘点状态失败");
//        }
        //获取源库存信息并迁移至新库位
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
                .eq("loc_no", sourceLocMast.getLocNo()));
        if (locDetls.isEmpty()) {
            throw new CoolException("保存工作主档历史档失败");
        }

        for (LocDetl locDetl : locDetls) {
            locDetl.setLocNo(wrkMast.getLocNo());
            locDetl.setModiTime(new Date());
            if (!locDetlService.insert(locDetl)) {
                throw new CoolException("迁移工作明细档失败");
            }
        }

        //清空源库位信息
        // 删除工作档源库位的库存明细
        if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocMast.getLocNo()))) {
            throw new CoolException("清空源库存信息失败");
        }

        // 修改源库位状态 P ===>> O
        if (sourceLocMast.getLocSts().equals("P")) {
            sourceLocMast.setLocSts("O");
            //更换盘点标记为N
            sourceLocMast.setMk("N");
            sourceLocMast.setBarcode("");
            sourceLocMast.setModiTime(now);
            sourceLocMast.setIoTime(now);
            if (!locMastService.updateById(sourceLocMast)) {
                throw new CoolException("修改源库位状态失败");
            }
        }

        return dto;
    }

    /**
@@ -160,8 +359,26 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto,0);
//        List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
//        List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
//        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(matnrs.get(0), batchs.get(0));
        WaitPakin waitPakin1 = waitPakins.get(0);
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
        findLocNoAttributeVo.setMatnr(waitPakin1.getMatnr());

        //TODO 测试
//        StartupDto dto = new StartupDto();
//        dto.setCrnNo(1);
//        dto.setSourceStaNo(devpNo);
//        dto.setStaNo(103);
//        LocMast locMastxx = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "O"));
//        dto.setLocNo(locMastxx.getLocNo());
//        dto.setWorkNo(Integer.parseInt((System.currentTimeMillis() + "").substring(10)));

        StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
        if (dto == null) {
            throw new CoolException("找不到空库位");
        }
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -170,7 +387,7 @@
        wrkMast.setIoTime(new Date());
        wrkMast.setWrkSts(2L); // 工作状态：生成入库ID
        wrkMast.setIoType(1); // 入出库状态：1.入库
        wrkMast.setIoPri(13D); // 优先级
        wrkMast.setIoPri(30D); // 优先级
        wrkMast.setCrnNo(dto.getCrnNo());
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
@@ -185,6 +402,8 @@
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        wrkMast.setModiUser(waitPakin1.getModiUser());
        wrkMast.setAppeUser(waitPakin1.getAppeUser());
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
@@ -202,31 +421,25 @@
            }
        });
        // 更新入库通知档 ioStatus ===>> Y
        Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
                .eq("zpallet", barcode);
        WaitPakin setParam = new WaitPakin();
        setParam.setLocNo(dto.getLocNo());
        setParam.setIoStatus("Y");
        setParam.setModiTime(now);
        if (!waitPakinService.update(setParam, wrapper)) {
        if (!waitPakinService.updateIoStatus("Y", dto.getLocNo(), barcode)) {
            throw new CoolException("更新通知档失败");
        }
        // 更新源站点信息
        sourceStaNo.setWrkNo(workNo);
        sourceStaNo.setModiTime(now);
        if (!basDevpService.updateById(sourceStaNo)){
        if (!basDevpService.updateById(sourceStaNo)) {
            throw new CoolException("更新源站失败");
        }
        // 更新目标库位状态
        LocMast locMast = locMastService.selectById(dto.getLocNo());
        if (locMast.getLocSts().equals("O")){
        if (locMast.getLocSts().equals("O")) {
            locMast.setLocSts("S"); // S.入库预约
            locMast.setModiTime(now);
            if (!locMastService.updateById(locMast)){
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("改变库位状态失败");
            }
        } else {
            throw new CoolException(dto.getLocNo()+"目标库位已被占用");
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }
        return dto;
    }
@@ -236,7 +449,9 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();

        StartupDto dto = commonService.getLocNo(10, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -266,21 +481,130 @@
        // 更新源站点信息
        sourceStaNo.setWrkNo(workNo);
        sourceStaNo.setModiTime(new Date());
        if (!basDevpService.updateById(sourceStaNo)){
        if (!basDevpService.updateById(sourceStaNo)) {
            throw new CoolException("更新源站失败");
        }
        // 更新目标库位状态
        LocMast locMast = locMastService.selectById(dto.getLocNo());
        if (locMast.getLocSts().equals("O")){
        if (locMast.getLocSts().equals("O")) {
            locMast.setLocSts("S"); // S.入库预约
            locMast.setModiTime(new Date());
            if (!locMastService.updateById(locMast)){
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("改变库位状态失败");
            }
        } else {
            throw new CoolException(dto.getLocNo()+"目标库位已被占用");
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }
        return dto;
    }

    @Transactional
    public synchronized void transferLoc(String sourceLocNo, Integer lane) {
        LocMast sourceLocMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", sourceLocNo));
        if (sourceLocMast == null) {
            throw new CoolException(sourceLocNo + "源库位不存在");
        }

        if (!(sourceLocMast.getLocSts().equals("F") || sourceLocMast.getLocSts().equals("D"))) {
            throw new CoolException(sourceLocNo + "源库位状态不处于在库");
        }

        List<Integer> rows = locMastService.selectRowByCrnNo(sourceLocMast.getCrnNo());
        LocMast transferLoc = null;
        for (Integer row : rows) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("row1", row)
                    .eq("loc_type1", sourceLocMast.getLocType1())
                    .eq("loc_sts", "O")
            );
            for (LocMast locMast : locMasts) {
                if (sourceLocMast.getCrnNo() == 1) {
                    if (Utils.getLaneByLocNo(locMast.getLocNo()) != lane) {
                        continue;
                    }
                }

                if (Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, locMast.getLocNo());
                    LocMast shallowLoc1 = locMastService.selectById(shallowLocNo);
                    if (!shallowLoc1.getLocSts().equals("O")) {
                        continue;
                    }
                }

                transferLoc = locMast;
                break;
            }

            if (null != transferLoc) {
                break;
            }
        }

        if (transferLoc == null) {
            throw new CoolException(sourceLocNo + "库位移转失败，未找到空库位");
        }

        // 获取工作号
        int workNo = commonService.getWorkNo(0);
        // 保存工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(new Date());
        wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
        wrkMast.setIoType(11); // 入出库状态： 11.库格移载
        wrkMast.setIoPri(13D);
        wrkMast.setCrnNo(transferLoc.getCrnNo());
        wrkMast.setSourceLocNo(sourceLocMast.getLocNo()); // 源库位
        wrkMast.setLocNo(transferLoc.getLocNo()); // 目标库位
        wrkMast.setFullPlt(sourceLocMast.getLocSts().equals("D") ? "N" : "Y"); // 满板
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk(sourceLocMast.getLocSts().equals("D") ? "Y" : "N"); // 空板
        wrkMast.setBarcode(sourceLocMast.getBarcode()); // 托盘码
        wrkMast.setLinkMis("N");
        wrkMast.setAppeTime(new Date());
        wrkMast.setModiTime(new Date());
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException(sourceLocNo + "库位移转失败，生成库位移转工作档失败");
        }

        // 工作档明细保存
        if (sourceLocMast.getLocSts().equals("F")) {
            List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocMast.getLocNo()));

            for (LocDetl locDetl : locDetls) {
                WrkDetl wrkDetl = new WrkDetl();
                wrkDetl.sync(locDetl);
                wrkDetl.setWrkNo(workNo);
                wrkDetl.setIoTime(new Date());
                wrkDetl.setAnfme(locDetl.getAnfme());
                wrkDetl.setAppeTime(new Date());
                wrkDetl.setModiTime(new Date());
                if (!wrkDetlService.insert(wrkDetl)) {
                    throw new CoolException(sourceLocNo + "库位移转失败，生成库位移转工作明细档失败");
                }
            }
        }

        // 修改源库位状态
        if (sourceLocMast.getLocSts().equals("D") || sourceLocMast.getLocSts().equals("F")) {
            sourceLocMast.setLocSts("R"); // R.出库预约
            sourceLocMast.setModiTime(new Date());
            if (!locMastService.updateById(sourceLocMast)) {
                throw new CoolException(sourceLocNo + "库位移转失败，更新源库位状态失败");
            }
        }

        // 修改目标库位状态
        if (transferLoc.getLocSts().equals("O")) {
            transferLoc.setLocSts("S"); // S.入库预约
            transferLoc.setModiTime(new Date());
            if (!locMastService.updateById(transferLoc)) {
                throw new CoolException(sourceLocNo + "库位移转失败，更新目标库位状态失败");
            }
        }
    }

}