#

Junjie

3 天以前 d74e41701d48afe3e36dbec7f242765fc47096ea

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

@@ -6,19 +6,27 @@
import com.core.common.R;
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.service.CommonService;
import com.zy.common.web.param.NotifyDto;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

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

/**
@@ -43,13 +51,50 @@
    private WaitPakinService waitPakinService;
    @Autowired
    private  LocDetlService locDetlService;
    @Autowired
    private  BasCrnpService basCrnpService;
    @Autowired
    private WorkService workService;

    @Value("${led.ip}")
    private String ledIp;
    @Value("${led.port}")
    private String ledPort;
    @Value("${led.url}")
    private String ledUrl;
    @Value("${led.id}")
    private String ledId;


    @GetMapping("/getLedInfos")
    public R getLedInfos(HttpServletRequest request) {
//        String remoteAddr = request.getRemoteAddr();
        HashMap<String, String> map = new HashMap<>();
        map.put("ledIp",ledIp);
        map.put("ledPort",ledPort);
        map.put("ledUrl",ledUrl);
        map.put("ledId",ledId);
        return R.ok(map);
    }


    @PostMapping("/pakin/loc/v1")
    @ResponseBody
    public synchronized R getLocNo(@RequestBody SearchLocParam param) {
        if (Cools.isEmpty(param.getIoType())) {
            return R.error("入出库类型不能为空");
        }
    @Transactional
    public synchronized R getLocNo(@RequestBody(required = false) SearchLocParam param) {
        WaitPakin waitPakin = new WaitPakin();
        log.info("收到WCS入库接口请求====>>入参:{}", param);
        //wcs调用此接口向组托表插入一条数据模拟组托
        waitPakin.setZpallet(param.getBarcode());
        waitPakin.setAnfme(100.0D);
        waitPakin.setMatnr("50001LR-71");
        waitPakin.setMaktx("气泡袋");
        waitPakin.setSpecs("50001LR-71");
        waitPakin.setModel("skv");
        waitPakinService.insert(waitPakin);
//        if (Cools.isEmpty(param.getIoType())) {
//            return R.error("入出库类型不能为空");
//        }
        if (Cools.isEmpty(param.getSourceStaNo())) {
            return R.error("源站编号不能为空");
        }
@@ -66,48 +111,102 @@
                }
                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("工作档/库存条码数据已存在");
                return R.error(CodeRes.EXIST_500);
            }
        }
        if (Cools.isEmpty(param.getLocType1())){
        if (Cools.isEmpty(param.getLocType1())) {
            return R.error("高低检测信号不能为空");
        }

        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1(param.getLocType1());

        StartupDto dto = null;
        switch (param.getIoType()) {
            case 1://满托盘入库
                assert waitPakins != null;
                dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
//                dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
                dto = startupFullPutStoreToWmsDev(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins,param.getRow());
                break;
            case 10://空托盘入库
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
                dto = emptyPlateIn(param.getSourceStaNo(), param.getBarcode(),param.getRow());
                break;
            default:
                break;
        }

        log.info("WCS入库接口返参:{},托盘码:{}", dto, param.getBarcode());
        return R.ok().add(dto);
    }

    @PostMapping("/pakin/loc/returnWarehouse")
    @ResponseBody
    public synchronized R returnWarehouse(@RequestBody(required = false) SearchLocParam param) {
        log.info("收到WCS拣选盘点入库接口请求====>>入参:{}", param);
        if (Cools.isEmpty(param.getSourceStaNo())) {
            return R.error("源站编号不能为空");
        }
        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1(param.getLocType1());

        StartupDto dto = startupPickIn(param.getSourceStaNo(), param.getBarcode(), locTypeDto,param.getRow());;
        log.info("WCS拣选盘点入库接口返参:{},托盘码:{}", dto, param.getBarcode());
        return R.ok().add(dto);
    }

    @PostMapping("/taskWrk/state")
    @ResponseBody
    public R taskWrkState(@RequestBody(required = false) NotifyDto notifyDto){
        log.info("收到WCS请求上报接口======>>工作号:{},入参:{}",notifyDto.getSuperTaskNo(),notifyDto);
        if (Cools.isEmpty(notifyDto.getNotifyType())){
            return R.error("通知类型不能为空");
        }
        if (Cools.isEmpty(notifyDto.getTaskNo())){
            return R.error("任务号不能为空");
        }
        WrkMast wrkMast = new WrkMast();
        switch (notifyDto.getMsgType()){
            case "task_complete":
                wrkMast = wrkMastService.selectByTaskNo(notifyDto.getSuperTaskNo());
                if (wrkMast != null && (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 11)){
                    wrkMast.setWrkSts(4L);
                    if (!wrkMastService.updateById(wrkMast)){
                        return R.error("修改工作档失败====>4");
                    }
                }else if (wrkMast != null && (wrkMast.getIoType() == 101)){
                    wrkMast.setWrkSts(14L);
                    if (!wrkMastService.updateById(wrkMast)){
                        return R.error("修改工作档失败====>14");
                    }
                }
                break;
            case "task_cancel":
                workService.cancelWrkMast(notifyDto.getSuperTaskNo(), 9527L);
        }
        return R.ok();
    }

    /**
     * 全板入库
     */
    @Transactional
    public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
    public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins,int[] row) {
        // 源站点状态检测
        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);
        int workNo = dto.getWorkNo();
//        List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
//        List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
        WaitPakin waitPakin1 = waitPakins.get(0);
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
        findLocNoAttributeVo.setMatnr(waitPakin1.getMatnr());

        StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
        if (dto == null) {
            throw new CoolException("找不到空库位");
        }
        int workNo = dto.getTaskNo();
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -130,6 +229,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("保存工作档失败");
@@ -147,41 +248,216 @@
            }
        });
        // 更新入库通知档 ioStatus ===>> Y
        Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
                .eq("zpallet", barcode);
        WaitPakin setParam = new WaitPakin();
        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;
    }

    /**
     * 全板入库-wms-dev
     */
    @Transactional
    public StartupDto startupFullPutStoreToWmsDev(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins,int[] row) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
//        List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
//        List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
        WaitPakin waitPakin1 = waitPakins.get(0);
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
        findLocNoAttributeVo.setMatnr(waitPakin1.getMatnr());

        StartupDto dto = commonService.getLocNoToWmsDev(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode,row);
        if (dto == null) {
            throw new CoolException("找不到空库位");
        }
        int workNo = dto.getTaskNo();
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(new Date());
        wrkMast.setWrkSts(2L); // 工作状态：生成入库ID
        wrkMast.setIoType(1); // 入出库状态：1.入库
        wrkMast.setIoPri(13D); // 优先级
        wrkMast.setCrnNo(dto.getCrnNo());
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(loc(dto.getLocNo()));
        wrkMast.setBarcode(barcode); // 托盘码
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setLinkMis("Y");
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        wrkMast.setModiUser(waitPakin1.getModiUser());
        wrkMast.setAppeUser(waitPakin1.getAppeUser());
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
        }
        // 生成工作档明细
        waitPakins.forEach(waitPakin -> {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(waitPakin);
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }
        });
        // 更新入库通知档 ioStatus ===>> Y
        if (!waitPakinService.updateIoStatus("Y", dto.getLocNo(), barcode)) {
            throw new CoolException("更新通知档失败");
        }
        // 更新源站点信息
        sourceStaNo.setWrkNo(workNo);
        sourceStaNo.setModiTime(now);
        if (!basDevpService.updateById(sourceStaNo)) {
            throw new CoolException("更新源站失败");
        }
        // 更新目标库位状态
        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;
    }

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

    /**
     * 拣选入库
     */
    @Transactional
    public StartupDto startupPickIn(Integer devpNo, String barcode, LocTypeDto locTypeDto,int[] row) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);

        WrkMast wrkMastOut = wrkMastService.selectByBarcode(barcode);
        if (wrkMastOut == null) {
            throw new CoolException("拣选盘点任务不存在");
        }

        if (wrkMastOut.getIoType() != 103 || wrkMastOut.getIoType() != 107) {
            throw new CoolException("任务类型不属于拣选、盘点");
        }

        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMastOut.getWrkNo());
        if (wrkDetls.isEmpty()) {
            throw new CoolException("拣选盘点任务数据不存在");
        }

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

        StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
        if (dto == null) {
            throw new CoolException("找不到空库位");
        }

        Date now = new Date();

        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        int workNo = dto.getTaskNo();
        wrkMast.setWrkNo(workNo);
        wrkMast.setWrkSts(2L); // 工作状态：生成入库ID
        wrkMast.setIoType(wrkMastOut.getIoType() - 50); // 入出库状态：53.拣料再入库
        wrkMast.setIoPri(30D); // 优先级
        wrkMast.setCrnNo(dto.getCrnNo());
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setBarcode(barcode); // 托盘码
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setLinkMis("Y");
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
        }

        wrkDetlService.updateWorkNo(wrkMastOut.getWrkNo(), workNo);

        // 删除工作主档
        if (!wrkMastService.deleteById(wrkMastOut)) {
            throw new CoolException("删除工作主档失败，workNo=" + wrkMastOut.getWrkNo());
        }

        // 更新源站点信息
        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("S"); // S.入库预约
            locMast.setModiTime(now);
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("改变库位状态失败");
            }
        } else {
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }
        return dto;
    }

    @Transactional
    public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
    public StartupDto emptyPlateIn(Integer devpNo, String barcode,int[] row) {
        // 检索库位
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
        int workNo = dto.getWorkNo();
        Integer[] arr=arr();

        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
        LocTypeDto locTypeDto = new LocTypeDto();

        // 检索库位
        StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode);

        String locNo = dto.getLocNo();

        int workNo = commonService.getWorkNo(0);
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
@@ -189,17 +465,15 @@
        wrkMast.setWrkSts(2L); // 工作状态：生成入库ID
        wrkMast.setIoType(10); // 入出库状态：10.空板入库
        wrkMast.setIoPri(13D); // 优先级
        wrkMast.setCrnNo(dto.getCrnNo());
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setSourceStaNo(devpNo);
        wrkMast.setLocNo(locNo);
        wrkMast.setFullPlt("N"); // 满板
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("Y"); // 空板
        wrkMast.setLinkMis("Y");
        wrkMast.setBarcode(barcode);
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
        wrkMast.setCtnType(2); // 容器类型
        // 操作人员数据
        wrkMast.setAppeTime(new Date());
        wrkMast.setModiTime(new Date());
@@ -207,14 +481,8 @@
        if (!res) {
            throw new CoolException("保存工作档失败");
        }
        // 更新源站点信息
        sourceStaNo.setWrkNo(workNo);
        sourceStaNo.setModiTime(new Date());
        if (!basDevpService.updateById(sourceStaNo)){
            throw new CoolException("更新源站失败");
        }
        // 更新目标库位状态
        LocMast locMast = locMastService.selectById(dto.getLocNo());
        LocMast locMast = locMastService.selectById(locNo);
        if (locMast.getLocSts().equals("O")){
            locMast.setLocSts("S"); // S.入库预约
            locMast.setModiTime(new Date());
@@ -222,9 +490,87 @@
                throw new CoolException("改变库位状态失败");
            }
        } else {
            throw new CoolException(dto.getLocNo()+"目标库位已被占用");
            throw new CoolException(locNo + "目标库位已被占用");
        }
        return dto;
    }

    @Transactional
    public Integer[] arr() {
        //获取有标记的小车，按顺序进行记录
        int count =basCrnpService.selectCount(new EntityWrapper<BasCrnp>());
        //初始化数组
        Integer [] arr=new Integer[7];
        //数组标记
        int i=0;
        BasCrnp basCrnp=basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("tank_qty",1));
        //没有找到标记时按默认一号小车所在层开始排
        if(Cools.isEmpty(basCrnp)){
            for(int q=1;q<=count;q++){
                basCrnp=basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no",q));
                if(Cools.isEmpty(basCrnp)){
                    log.error(q+"号小车没有找到");
                    continue;
                }
                if(basCrnp.getCrnErr()>0||basCrnp.getCrnSts()!=1){
                    log.error(q+"号小车报警或者在充电跳过此车");
                    continue;
                }
                arr[i]=basCrnp.getLev1();
                i++;
                if(q==1){
                    basCrnp.setTankQty(0);
                    basCrnpService.update(basCrnp,new EntityWrapper<BasCrnp>().eq("crn_no",1));
                }else if(q==2){
                    basCrnp.setTankQty(1);
                    basCrnpService.update(basCrnp,new EntityWrapper<BasCrnp>().eq("crn_no",2));
                }
            }
        }else{
            basCrnp.setTankQty(0);
            basCrnpService.update(basCrnp,new EntityWrapper<BasCrnp>().eq("crn_no",basCrnp.getCrnNo()));
            int xx=0;
            arr[i]=basCrnp.getLev1();
            i++;
            int o=basCrnp.getCrnNo();
            for(int q=1;q<count;q++){
                if(++o>count){
                    o=1;
                }
                basCrnp=basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no",o));
                if(Cools.isEmpty(basCrnp)){
                    log.error(q+"号小车没有找到");
                    continue;
                }
                if(basCrnp.getCrnErr()>0||basCrnp.getCrnSts()!=1){
                    log.error(q+"号小车报警或者在充电跳过此车");
                    continue;
                }
                if(xx==0){
                    basCrnp.setTankQty(1);
                    basCrnpService.update(basCrnp,new EntityWrapper<BasCrnp>().eq("crn_no",o));
                }
                arr[i]=basCrnp.getLev1();
                i++;
                xx++;
            }

        }
        for (int w=1;w<=7;w++){
            boolean boo=true;
            for(int g=0;g<i;g++){
                if(arr[g]==w){
                    boo=false;
                    break;
                }
            }
            if(boo){
                arr[i]=w;
                i++;
            }
            if(i==7) break;
        }
        return arr;
    }

}