#

Junjie

10 小时以前 b0d8734e81b825381f1b2af13e0df33cd5114e2d

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

@@ -7,13 +7,15 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.entity.result.StorageResult;
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.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.web.param.GetLocNoChangeParam;
import com.zy.common.web.param.GetLocNoReassignParam;
import com.zy.common.web.param.NotifyDto;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
@@ -23,11 +25,10 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * Created by vincent on 2020/10/30
@@ -77,6 +78,25 @@
        return R.ok(map);
    }

    @PostMapping("/reassign/loc/v1")
    @ResponseBody
    @Transactional
    public synchronized R getLocNoReassign(@RequestBody(required = false) GetLocNoReassignParam param) {
        log.info("收到WCS重新分配入库接口请求====>>入参:{}", param);
        StartupDto dto = startupFullReassign(param.getTaskNo(), param.getRow());
        log.info("WCS重新分配入库接口返参:{}", dto);
        return R.ok().add(dto);
    }

    @PostMapping("/change/loc/v1")
    @ResponseBody
    @Transactional
    public synchronized R getLocNoChange(@RequestBody(required = false) GetLocNoChangeParam param) {
        log.info("收到WCS申请在库库位更换库位请求====>>入参:{}", param);
        StartupDto dto = applyChangeLocNo(param.getLocNo(), param.getRow());
        log.info("WCS申请在库库位更换库位接口返参:{}", dto);
        return R.ok().add(dto);
    }

    @PostMapping("/pakin/loc/v1")
    @ResponseBody
@@ -103,6 +123,18 @@
            if (Cools.isEmpty(param.getBarcode())) {
                return R.error("条码不能为空");
            }

            WrkMast wrkMast1 = wrkMastService.selectByBarcode(param.getBarcode());
            if (wrkMast1 != null) {
                StartupDto startupDto = new StartupDto();
                startupDto.setTaskNo(wrkMast1.getWrkNo());
                startupDto.setSourceStaNo(wrkMast1.getSourceStaNo());
                startupDto.setTaskPri(wrkMast1.getIoPri());
                startupDto.setCrnNo(wrkMast1.getCrnNo());
                startupDto.setLocNo(Utils.locToLocNo(wrkMast1.getLocNo()));
                return R.ok().add(startupDto);
            }

            waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
            if (Cools.isEmpty(waitPakins)) {
                WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
@@ -123,6 +155,10 @@

        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1(param.getLocType1());

        if (param.getRow().length == 0) {
            return R.error("WCS上报无可用设备");
        }

        StartupDto dto = null;
        switch (param.getIoType()) {
@@ -181,6 +217,7 @@
                        return R.error("修改工作档失败====>14");
                    }
                }
                break;
            case "task_cancel":
                workService.cancelWrkMast(notifyDto.getSuperTaskNo(), 9527L);
        }
@@ -330,7 +367,7 @@
            }
        });
        // 更新入库通知档 ioStatus ===>> Y
        if (!waitPakinService.updateIoStatus("Y", dto.getLocNo(), barcode)) {
        if (!waitPakinService.updateIoStatus("Y", loc(dto.getLocNo()), barcode)) {
            throw new CoolException("更新通知档失败");
        }
        // 更新源站点信息
@@ -353,6 +390,170 @@
        return dto;
    }

    /**
     * 全板入库-重新分配
     */
    @Transactional
    public StartupDto startupFullReassign(String workNo, int[] row) {
        WrkMast sourceWrkMast = wrkMastService.selectByTaskNo(workNo);
        if(sourceWrkMast == null) {
            throw new CoolException(workNo + "工作数据不存在");
        }

        List<WrkDetl> sourceWrkDetlList = wrkDetlService.selectByWrkNo(sourceWrkMast.getWrkNo());
        if (sourceWrkDetlList.isEmpty()) {
            throw new CoolException(workNo + "工作明细数据不存在");
        }

        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
        findLocNoAttributeVo.setMatnr(sourceWrkDetlList.get(0).getMatnr());

        LocMast sourceLocMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", sourceWrkMast.getLocNo()));
        if (sourceLocMast == null) {
            throw new CoolException(sourceWrkMast.getLocNo() + "库位数据不存在");
        }

        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1(sourceLocMast.getLocType1());

        StartupDto dto = commonService.getLocNoToWmsDev(1, sourceWrkMast.getSourceStaNo(), findLocNoAttributeVo, locTypeDto, sourceWrkMast.getBarcode(), row);
        if (dto == null) {
            throw new CoolException("找不到空库位");
        }
        dto.setTaskNo(sourceWrkMast.getWrkNo());

        Date now = new Date();
        // 生成工作档
        sourceWrkMast.setIoTime(new Date());
        sourceWrkMast.setWrkSts(2L); // 工作状态：生成入库ID
        sourceWrkMast.setIoType(1); // 入出库状态：1.入库
        sourceWrkMast.setIoPri(13D); // 优先级
        sourceWrkMast.setCrnNo(dto.getCrnNo());
        sourceWrkMast.setSourceStaNo(dto.getSourceStaNo());
        sourceWrkMast.setStaNo(dto.getStaNo());
        sourceWrkMast.setLocNo(loc(dto.getLocNo()));
        sourceWrkMast.setModiTime(now);
        boolean res = wrkMastService.updateById(sourceWrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
        }

        // 更新源库位状态
        if (sourceLocMast.getLocSts().equals("S")) {
            sourceLocMast.setLocSts("O");
            sourceLocMast.setModiTime(now);
            if (!locMastService.updateById(sourceLocMast)) {
                throw new CoolException("改变库位状态失败");
            }
        } else {
            throw new CoolException(dto.getLocNo() + "目标库位状态不属于入库预约中");
        }

        // 更新目标库位状态
        LocMast locMast = locMastService.selectById(loc(dto.getLocNo()));
        if (locMast.getLocSts().equals("O")) {
            locMast.setLocSts("S"); // S.入库预约
            locMast.setModiTime(now);
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("改变库位状态失败");
            }
        } else {
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }
        return dto;
    }

    /**
     * WCS申请在库库位更换库位
     */
    @Transactional
    public StartupDto applyChangeLocNo(String wcsLocNo, int[] row) {
        String sourceLocNo = loc(wcsLocNo);
        LocMast sourceLocMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", sourceLocNo));
        if (sourceLocMast == null) {
            throw new CoolException("源库位不存在");
        }
        List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
        LocDetl sourceLocDetl = locDetlList.get(0);

        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
        findLocNoAttributeVo.setMatnr(sourceLocDetl.getMatnr());

        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1(sourceLocMast.getLocType1());

        StartupDto dto = commonService.getLocNoToWmsDev(1, null, findLocNoAttributeVo, locTypeDto, sourceLocMast.getBarcode(), row);
        if (dto == null) {
            throw new CoolException("找不到空库位");
        }

        String locNo = loc(dto.getLocNo());
        LocMast loc = locMastService.selectById(locNo);
        if (Cools.isEmpty(loc)){
            throw new CoolException("未找到库位");
        }
        Date now = new Date();
        // 获取工作号
        int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
        dto.setTaskNo(workNo);

        // 保存工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
        wrkMast.setIoType(11); // 入出库状态： 11.库格移载
        wrkMast.setIoPri(10D);
        wrkMast.setSourceLocNo(sourceLocNo); // 源库位
        wrkMast.setLocNo(locNo); // 目标库位
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setBarcode(sourceLocMast.getBarcode()); // 托盘码
        wrkMast.setLinkMis("N");
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
        }
        // 工作档明细保存
        for (LocDetl locDetl : locDetlList) {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(locDetl);
            wrkDetl.setWrkNo(workNo);
            wrkDetl.setIoTime(now);
            wrkDetl.setAnfme(locDetl.getAnfme());
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作档明细失败");
            }
        }
        // 修改源库位状态
        if (sourceLocMast.getLocSts().equals("D") || sourceLocMast.getLocSts().equals("F")) {
            sourceLocMast.setLocSts("R"); // R.出库预约
            sourceLocMast.setModiTime(now);
            if (!locMastService.updateById(sourceLocMast)){
                throw new CoolException("更新源库位状态失败");
            }
        } else {
            throw new CoolException("源库位出库失败，状态：" + sourceLocMast.getLocSts$());
        }

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

    public String loc(String locNo){
        String[] split = locNo.split("-");
        return Utils.getLocNo(Integer.parseInt(split[0]),Integer.parseInt(split[1]),Integer.parseInt(split[2]));