1

ZY

2024-08-19 fc3347a225114a8dbd37b451981109c8170b9dd4

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

@@ -44,11 +44,21 @@
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private  LocDetlService locDetlService;
    private LocDetlService locDetlService;
    @Autowired
    private RowLastnoService rowLastnoService;
    @Autowired
    private WorkService workService;

    @Autowired
    private StaDescService staDescService;

    @Autowired
    private OrderService orderService;

    @Autowired
    private OrderDetlService orderDetlService;


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

@@ -104,14 +114,164 @@
        return R.ok().add(dto);
    }

    @PostMapping("/pakin2/loc/v1")
    @ResponseBody
    @Transactional
    public synchronized R getLocNo2(@RequestBody SearchLocParam param) {
        log.info("收到WCS入库接口请求2====>>入参:{}", param);
        if (Cools.isEmpty(param.getIoType())) {
            return R.error("入出库类型不能为空");
        }
        if (Cools.isEmpty(param.getSourceStaNo())) {
            return R.error("源站编号不能为空");
        }
        if (Cools.isEmpty(param.getBarcode())) {
            return R.error("条码不能为空");
        }

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

        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                .eq("barcode", param.getBarcode())
                .eq("io_type", param.getIoType())
                .eq("wrk_sts", 14));
        StartupDto dto = new StartupDto();

        if (Cools.isEmpty(wrkMast)) {
            try {
                log.info("/pakin2/loc/v1:" + dto + "======托盘码:" + param.getBarcode() + "此笔工作档未查询到盘点/拣料出库任务，开始查询盘点/拣料再入库任务==》");
                WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                        .eq("barcode", param.getBarcode())
                        .eq("io_type", param.getIoType() - 50)
                        .eq("wrk_sts", 2));
                if (Cools.isEmpty(wrkMast1)) {
                    return R.error("未查询到工作档===》托盘码:" + param.getBarcode());
                }
                // 获取目标站
                Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                        .eq("type_no", param.getIoType() - 50)
                        .eq("stn_no", sourceStaNo.getDevNo())
                        .eq("crn_no", wrkMast1.getCrnNo());
                StaDesc staDesc = staDescService.selectOne(wrapper);
                if (Cools.isEmpty(staDesc)) {
                    log.error("type_no={},stn_no={},crn_no={}", param.getIoType() - 50, sourceStaNo, wrkMast1.getCrnNo());
                    throw new CoolException("入库路径不存在");
                }
                if (!staDesc.getCrnStn().equals(wrkMast1.getStaNo())) {
                    throw new CoolException("堆垛机作业站点与工作号目标站点不一致！！！请联系工程师修改" +
                            "\\n堆垛机号：" + wrkMast1.getCrnNo() +
                            "\\n堆垛机站点：" + staDesc.getCrnStn() +
                            "\\n工作号：" + wrkMast1.getWrkNo() +
                            "\\n工作档目标站点：" + wrkMast1.getStaNo());
                }
                dto.setWorkNo(wrkMast1.getWrkNo());
                dto.setCrnNo(wrkMast1.getCrnNo());
                dto.setLocNo(wrkMast1.getLocNo());
                dto.setStaNo(wrkMast1.getStaNo());
                dto.setSourceStaNo(wrkMast1.getSourceStaNo());
                log.info("/pakin2/loc/v1:" + dto + "======托盘码:" + param.getBarcode() + "此笔工作档已经是盘点再入库状态，返回wcs下发信息");
                return R.ok().add(dto);
            } catch (Exception e) {
                log.error("/pakin2/loc/v1:======托盘码:" + param.getBarcode() + "盘点回库查询工作档出错======>" + e);
                return R.error("查看wms==>info==>error");
            }
        }

        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
        if (Cools.isEmpty(locDetls) || locDetls.size() < 1) {
            return R.error("托盘码:" + param.getBarcode() + ",未查到库存明细");
        } else {
            if (!locDetls.get(0).getLocNo().equals(wrkMast.getSourceLocNo())) {
                return R.error("明细已经被修改,故障");
            }
        }

        Date now = new Date();
        if (param.getIoType() == 107 || param.getIoType() == 103) {//盘点再入库
            try {
                // 检索库位
                try {
                    dto = commonService.getLocNo(1, 1, param.getSourceStaNo(), locDetls.get(0).getMatnr(), null, null, locTypeDto);
                } catch (Exception e) {
                    log.error("堆垛机站盘点再入库查询库位出错:" + e.getMessage() + e);
                    throw new Exception("查询库位出错，参数：param.getSourceStaNo():" + param.getSourceStaNo() + "==>locDetls:" + locDetls + "==>locTypeDto:" + locTypeDto);
                }
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", dto.getLocNo()));
                if (Cools.isEmpty(locMast) || Cools.isEmpty(locMast.getLocSts())) {
                    throw new Exception("目标库位locMast查询为空||locMast.getLocSts为空");
                } else {
                    if (!locMast.getLocSts().equals("O")) {
                        throw new Exception("目标库位！locMast.getLocSts.equals(“O”)" + locMast.getLocSts());
                    } else {
                        locMast.setLocSts("Q");
                        locMast.setBarcode(param.getBarcode());
                        if (!locMastService.updateById(locMast)) {
                            log.error(" /pakin2/loc/v1 --- 修改库位状态失败！" + locMast.getLocNo());
                            throw new Exception("修改库位状态失败");
                        }
                    }
                }
                if (!locDetlService.updateLocNo(locMast.getLocNo(), wrkMast.getSourceLocNo())) {
                    log.error(" /pakin2/loc/v1 --- 库存明细转移失败！" + wrkMast.getWrkNo());
                    throw new Exception("库存明细转移失败");
                }
                // 修改源库位状态 O 空库位
                LocMast locMast2 = locMastService.selectById(wrkMast.getSourceLocNo());
                locMast2.setLocSts("O");
                locMast2.setBarcode("");
                locMast2.setModiTime(now);
                if (!locMastService.updateById(locMast2)) {
                    log.error(" /pakin2/loc/v1 --- 修改源库位状态失败！" + wrkMast.getSourceLocNo());
                    throw new Exception("修改源库位状态失败");
                }

                try {
                    // 保存工作主档历史档
                    if (wrkMastService.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
                        log.error(" stnToCrnStnPick2 --- 保存工作主档历史档失败！" + wrkMast.getWrkNo());
                    }
                    // 更新工作档数据状态
                    wrkMast.setIoTime(now);
                    wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 107->57  103->53
                    wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
                    wrkMast.setSourceStaNo(param.getSourceStaNo()); // 源站
                    wrkMast.setStaNo(dto.getStaNo()); // 目标站
                    wrkMast.setModiTime(now);
                    wrkMast.setLocNo(dto.getLocNo());
                    wrkMast.setCrnNo(dto.getCrnNo());
                    if (!wrkMastService.updateById(wrkMast)) {
                        log.error(" stnToCrnStnPick --- 更新工作档数据状态失败！" + wrkMast.getWrkNo());
                        throw new CoolException("更新工作档数据状态失败");
                    }
                    // 更新明细档io_time (历史档关联使用）
                    wrkDetlService.updateIoTimeWms(wrkMast.getWrkNo(), now);
                } catch (Exception e) {
                    throw new CoolException("更新工作档数据状态出错");
                }
            } catch (Exception e) {
                log.error("/pakin2/loc/v1:======托盘码:" + param.getBarcode() + "盘点回库出错======>" + e);
                return R.error("查看wmsError");
            }
        } else {
            return R.error();
        }
        log.info("/pakin2/loc/v1:" + dto + "======托盘码:" + 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);

        // 检索库位
        StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 12, null,null,null, locTypeDto,0);
        StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 12, null, null, null, locTypeDto);
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -134,12 +294,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 +307,11 @@
        }
        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("生成自动空托出库失败"));
    }

    /**
@@ -162,7 +324,7 @@
        // 检索库位
        List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0),batchs.get(0),null, locTypeDto,0);
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -198,6 +360,22 @@
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            if (!Cools.isEmpty(waitPakin.getOrderNo())) {
                Order order = orderService.selectByNo(waitPakin.getOrderNo());
                if (order != null) {
                    OrderDetl orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), waitPakin.getBatch());
                    if (orderDetl == null) {
                        orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), null);
                    }
                    wrkDetl.setSPgNO(orderDetl.getSPgNO());
                    wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
                    wrkDetl.setLuHao(orderDetl.getLuHao());
                    wrkDetl.setPacking(orderDetl.getPacking());
                    wrkDetl.setColor(orderDetl.getColor());
                    wrkDetl.setWareId(orderDetl.getWareId());
                    wrkDetl.setWareName(orderDetl.getWareName());
                }
            }
            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }
@@ -215,19 +393,19 @@
        // 更新源站点信息
        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;
    }
@@ -237,7 +415,7 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null, locTypeDto,0);
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, null, null, locTypeDto);
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -267,19 +445,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;
    }