#

Junjie

1 天以前 bcd8d392d27ae13ed21fc1c96920a37544992d04

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

@@ -17,12 +17,12 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
 * Created by vincent on 2020/10/30
@@ -45,11 +45,15 @@
    @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;

    @PostMapping("/pakin/loc/v1")
    @ResponseBody
@@ -74,13 +78,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("高低检测信号不能为空");
        }

@@ -88,6 +92,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()) {
@@ -105,16 +118,38 @@
        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("/auto/emptyIn/v1")
    @ResponseBody
    public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto){
    public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);

        // 检索库位
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();

        StartupDto dto = commonService.getLocNo( 10, 12, findLocNoAttributeVo, locTypeDto);
        StartupDto dto = commonService.getLocNo(10, 12, findLocNoAttributeVo, locTypeDto, null);
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -137,12 +172,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)) {
@@ -150,9 +185,136 @@
        }
        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);
        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.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.拣料盘点出库");
        }

        //获取源库存信息并迁移至新库位
        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");
            sourceLocMast.setBarcode("");
            sourceLocMast.setModiTime(now);
            sourceLocMast.setIoTime(now);
            if (!locMastService.updateById(sourceLocMast)) {
                throw new CoolException("修改源库位状态失败");
            }
        }

        return dto;
    }

    /**
@@ -166,8 +328,23 @@
//        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));
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins.get(0));
        StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
        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();
        // 生成工作档
@@ -176,7 +353,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());
@@ -191,6 +368,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("保存工作档失败");
@@ -208,31 +387,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;
    }
@@ -244,7 +417,7 @@
        // 检索库位
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();

        StartupDto dto = commonService.getLocNo( 10, devpNo, findLocNoAttributeVo, locTypeDto);
        StartupDto dto = commonService.getLocNo(10, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -274,19 +447,19 @@
        // 更新源站点信息
        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;
    }