no message

skyouc

2 天以前 1e71bc58ffd44e9bfe2f15f0d227a2abf38caa48

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -17,6 +17,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.asrs.utils.Utils;
import com.zy.common.constant.HIKApiConstant;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
@@ -25,6 +26,7 @@
import com.zy.common.model.MesCombParam;
import com.zy.common.model.StartupDto;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.properties.SlaveProperties;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
@@ -86,6 +88,9 @@
    private ManLocDetlService manLocDetlService;
    @Autowired
    private ManLocDetlMapper manLocDetlMapper;

    @Autowired
    private SlaveProperties slaveProperties;

    @Autowired
    private AdjDetlService adjDetlService;
@@ -584,12 +589,13 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void comb(CombParam param, Long userId) {
        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
//        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
//            throw new CoolException(BaseRes.PARAM);
//        }
        if (Objects.isNull(param.getBarcode())) {
            throw new CoolException(BaseRes.PARAM);
        }
        if (param.getCombMats().size() < 1) {
            throw new CoolException("请提取一个商品，或者刷新重新组托！");
        }

        // 判断是否有相同条码的数据
        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode())
                .eq("io_status", "N")) > 0) {
@@ -621,51 +627,68 @@
        Date now = new Date();
        // 无单组托
        if (Cools.isEmpty(param.getOrderNo())) {
            // 生成入库通知档
            List<DetlDto> detlDtos = new ArrayList<>();
            param.getCombMats().forEach(elem -> {
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(),
                        elem.getStandby2(), elem.getStandby3(),
                        elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(),
                        elem.getThreeCode());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.findDto(detlDtos, detlDto);
                    assert one != null;
                    one.setAnfme(one.getAnfme() + detlDto.getAnfme());
                } else {
                    detlDtos.add(detlDto);
                }
            });

            for (DetlDto detlDto : detlDtos) {
                Mat mat = matService.selectByMatnr(detlDto.getMatnr());
                if (Cools.isEmpty(mat)) {
                    throw new CoolException(detlDto.getMatnr() + "商品档案不存在");
                }
                if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
                    throw new CoolException("物料：" + detlDto.getMatnr() + "单次最大组托上限为：" + mat.getUpQty());
                }
            if (param.getPakinType().equals("3")) {
                WaitPakin waitPakin = new WaitPakin();
                BeanUtils.copyProperties(mat, waitPakin);
                waitPakin.setBatch(detlDto.getBatch());
                waitPakin.setZpallet(param.getBarcode());
                waitPakin.setIoStatus("N");
                waitPakin.setAnfme(detlDto.getAnfme());
                waitPakin.setThreeCode(detlDto.getThreeCode());
                waitPakin.setStatus("Y");
                waitPakin.setSuppCode(detlDto.getStandby1());
                waitPakin.setStandby1(detlDto.getStandby1());
                waitPakin.setStandby2(detlDto.getStandby2());
                waitPakin.setStandby3(detlDto.getStandby3());
                waitPakin.setBoxType1(detlDto.getBoxType1());
                waitPakin.setBoxType2(detlDto.getBoxType2());
                waitPakin.setBoxType3(detlDto.getBoxType3());
                waitPakin.setAppeUser(userId);
                waitPakin.setAppeTime(now);
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
            } else {
                if (param.getCombMats().size() < 1) {
                    throw new CoolException("请提取一个商品，或者刷新重新组托！");
                }
                // 生成入库通知档
                List<DetlDto> detlDtos = new ArrayList<>();
                param.getCombMats().forEach(elem -> {
                    DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(),
                            elem.getStandby2(), elem.getStandby3(),
                            elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(),
                            elem.getThreeCode());
                    if (DetlDto.has(detlDtos, detlDto)) {
                        DetlDto one = DetlDto.findDto(detlDtos, detlDto);
                        assert one != null;
                        one.setAnfme(one.getAnfme() + detlDto.getAnfme());
                    } else {
                        detlDtos.add(detlDto);
                    }
                });

                for (DetlDto detlDto : detlDtos) {
                    Mat mat = matService.selectByMatnr(detlDto.getMatnr());
                    if (Cools.isEmpty(mat)) {
                        throw new CoolException(detlDto.getMatnr() + "商品档案不存在");
                    }
                    if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
                        throw new CoolException("物料：" + detlDto.getMatnr() + "单次最大组托上限为：" + mat.getUpQty());
                    }
                    WaitPakin waitPakin = new WaitPakin();
                    BeanUtils.copyProperties(mat, waitPakin);
                    waitPakin.setBatch(detlDto.getBatch());
                    waitPakin.setZpallet(param.getBarcode());
                    waitPakin.setIoStatus("N");
                    waitPakin.setAnfme(detlDto.getAnfme());
                    waitPakin.setThreeCode(detlDto.getThreeCode());
                    waitPakin.setStatus("Y");
                    waitPakin.setSuppCode(detlDto.getStandby1());
                    waitPakin.setStandby1(detlDto.getStandby1());
                    waitPakin.setStandby2(detlDto.getStandby2());
                    waitPakin.setStandby3(detlDto.getStandby3());
                    waitPakin.setBoxType1(detlDto.getBoxType1());
                    waitPakin.setBoxType2(detlDto.getBoxType2());
                    waitPakin.setBoxType3(detlDto.getBoxType3());
                    waitPakin.setAppeUser(userId);
                    waitPakin.setAppeTime(now);
                    waitPakin.setModiUser(userId);
                    waitPakin.setModiTime(now);
                    if (!waitPakinService.insert(waitPakin)) {
                        throw new CoolException("保存入库通知档失败");
                    }
                }
            }
            // 关联组托
@@ -1316,6 +1339,7 @@
            throw new CoolException("数据错误：单据不存在！！");
        }
        List<OrderDetlPakin> detlPakins = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>()
                .eq(!Cools.isEmpty(params.getThreeCode()), "three_code", params.getThreeCode())
                .eq(!Cools.isEmpty(params.getMatnr()), "matnr", params.getMatnr())
                .eq("order_id", orderPakin.getId()));
        if (Objects.isNull(detlPakins) || detlPakins.isEmpty()) {
@@ -1768,12 +1792,23 @@
            throw new CoolException("站点不能为空!!");
        }
        if (Objects.isNull(param.getLocType1())) {
            param.setLocType1((short)1);
            param.setLocType1((short) 1);
        }

        BasContainer container = basContainerService.selectOne(new EntityWrapper<BasContainer>().eq("barcode", param.getBarcode()));
        if (Objects.isNull(container)) {
            throw new CoolException("容器编码未维护，请维护后再操作！！");
        }

        log.info("WCS任务生成请求参数：", JSONObject.toJSONString(param));
        Integer whsType = 1;
        //用于判断料箱托盘，料箱，笼框
        if (container.getType().equals(ContainerType.CONTAINER_TYPE_SALVER.type)) {
            whsType = 3;
        } else if (container.getType().equals(ContainerType.CONTAINER_TYPE_CAGE.type)) {
            whsType = 2;
        }

        log.info("WCS任务生成请求参数：{}", JSONObject.toJSONString(param));

        BasDevp station = basDevpService.selectOne(new EntityWrapper<BasDevp>()
                .eq("dev_no", param.getSourceStaNo()));
@@ -1783,13 +1818,13 @@

        List<WaitPakin> waitPakins = waitPakinService
                .selectList(new EntityWrapper<WaitPakin>()
                        .eq("io_status" , "N")
                        .eq("io_status", "N")
                        .eq("zpallet", param.getBarcode()));
        if (Objects.isNull(waitPakins) || waitPakins.isEmpty()) {
            throw new CoolException("数据错误,组拖档已不存在!!");
        }

        WrkMast wrkMast = generateCrnInTask(waitPakins, station, param.getLocType1(), userId);
        WrkMast wrkMast = generateCrnInTask(waitPakins,whsType, station, param.getLocType1(), userId);

        Map<String, Object> response = new HashMap<>();
        response.put("taskNo", wrkMast.getWrkNo());
@@ -1932,12 +1967,13 @@
    /**
     * 生成堆垛机入库任务
     *
     * @param whsType
     * @param station
     * @author Ryan
     * @date 2025/12/9 13:54
     */
    @Transactional(rollbackFor = Exception.class)
    public WrkMast generateCrnInTask(List<WaitPakin> waitPakins, BasDevp station, Short locType, Long userId) {
    public WrkMast generateCrnInTask(List<WaitPakin> waitPakins, Integer whsType, BasDevp station, Short locType, Long userId) {
        Date now = new Date();
//        StationRela rela = stationRelaService.selectOne(new EntityWrapper<StationRela>()
//                .eq("agv_sta", station.getDevNo())
@@ -1993,7 +2029,7 @@
            }

        } else {
            StartupDto dto = commonService.getLocNo(1, sourceStaNo.getDevNo(), findLocNoAttributeVo, locTypeDto);
            StartupDto dto = commonService.getLocNo(1, sourceStaNo.getDevNo(), whsType,  findLocNoAttributeVo, locTypeDto);

            int workNo = dto.getWorkNo();
            // 生成工作档
@@ -2003,7 +2039,7 @@
            wrkMast.setIoType(1); // 入出库状态：1.入库
            wrkMast.setCrnNo(dto.getCrnNo());
            wrkMast.setSourceStaNo(dto.getSourceStaNo() + "");
            wrkMast.setStaNo(dto.getStaNo() + "");
            wrkMast.setStaNo(!Objects.isNull(dto.getStaNo()) ? dto.getStaNo() + "" : null);
            wrkMast.setLocNo(dto.getLocNo());
            wrkMast.setIoPri(13D); // 优先级
            wrkMast.setBarcode(pakin.getZpallet()); // 托盘码
@@ -2044,14 +2080,21 @@

        // 生成工作档明细
        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("保存工作明细失败");
            if (!Objects.isNull(waitPakin.getMatnr())) {
                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("保存工作明细失败");
                }
            } else {
                wrkMast.setWrkSts(1L);
                wrkMast.setIoType(10);

                wrkMastService.updateById(wrkMast);
            }
        });

@@ -2580,6 +2623,7 @@

    /**
     * 移库任务申请
     *
     * @param combParam
     * @param userId
     * @return
@@ -2642,6 +2686,97 @@
    }

    /**
     * 6.15WCS申请在库库位更换库位
     * @param combParam
     * @param l
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R changeLoc(CompleteParam combParam, long l) {
        if (Objects.isNull(combParam)) {
            return R.error("参数不能为空！");
        }
        if (Objects.isNull(combParam.getLocNo())) {
            return R.error("库位号不能为空!!");
        }
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", combParam.getLocNo()));
        if (Objects.isNull(locMast)) {
            return R.error("库位信息不存在或库位状态非 F.在库 状态");
        }

        List<Integer> doubleLocs = slaveProperties.getDoubleLocs();
        List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                .in("row1", doubleLocs)
                .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type));
        Map<String, Object> result = new HashMap<>();
        LocMast selected = new LocMast();
        for (LocMast loc : locMasts) {
            LocMast temLoc = locMastService.selectById(loc.getLocNo());
            if (Objects.isNull(temLoc)) {
                throw new CoolException("数据错误， 原库位信息不存在！！");
            }
            String shallowLoc = Utils.getShallowLoc(slaveProperties, temLoc.getLocNo());

            LocMast locMast1 = locMastService.selectById(shallowLoc);
            if (Objects.isNull(locMast1)) {
                throw new CoolException("数据错误， 新库位信息不存在！！");
            }
            if (!locMast1.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
                continue;
            }
            selected = loc;

            break;
        }

        WrkMast moveTask = generateMoveTask(selected, locMast);
        result.put("locNo", selected.getLocNo());
        result.put("taskNo", moveTask.getWrkNo());

        return R.ok().add(result);

    }

    /**
     * 生成移库任务
     *
     * @param result
     * @param sourceLoc
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public WrkMast generateMoveTask(LocMast result, LocMast sourceLoc) {
        WrkMast wrkMast = new WrkMast();
        int workNo = commonService.getWorkNo(0);

        wrkMast.setWrkNo(workNo);
        wrkMast.setLocNo(result.getLocNo());
        wrkMast.setSourceLocNo(sourceLoc.getLocNo());
        wrkMast.setWrkSts(11L);
        wrkMast.setIoType(11);
        wrkMast.setCrnNo(sourceLoc.getCrnNo());
        wrkMast.setAppeTime(new Date());
        wrkMast.setModiTime(new Date());
        wrkMast.setIoPri(13D);
        wrkMast.setWrkDate(new Date());

        if (!wrkMastService.insert(wrkMast)) {
            throw new CoolException("任务保存失败！！");
        }

        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLoc.getLocNo()));
        locDetls.forEach(detl -> {
            detl.setLocNo(result.getLocNo());
            if (!locDetlService.updateById(detl)) {
                throw new CoolException("明细更新失败！！");
            }
        });

        return wrkMast;
    }

    /**
     * 按优先级查找可用库位
     * 顺序：入库缓存区 -> SO区 -> EO区
     */