agv申请组托，agv申请出库

pang.jiabao

2024-10-17 61814ecc0e12f8bb84eb4c8c7dc1478cf6ebd8e8

agv申请组托，agv申请出库

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -2,11 +2,13 @@

import com.alibaba.fastjson.JSON;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.model.LocDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +16,6 @@

import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -33,6 +34,38 @@
    @Autowired
    private OpenService openService;

    @PostMapping("/grouping")
    @AppAuth(memo = "AGV组托调用")
    public synchronized R grouping(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) AgvGroupingParam param,
                                      HttpServletRequest request){
        auth(appkey, param, request);
        if (Cools.isEmpty(param.getOrderNo())) {
            param.setOrderNo(param.getBillNo());
        }
        List<AgvGroupingParam.CombMat> combMats = param.getCombMats();
        combMats.forEach(elem -> {
            if (Cools.isEmpty(elem.getBatch())) {
                elem.setBatch(elem.getItemBatch());
            }
        });

        return openService.grouping(param);
    }

    @PostMapping("/outbound")
    @AppAuth(memo = "AGV出库调用")
    public synchronized R outbound(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) List<LocDto> locDtos,
                                      HttpServletRequest request) throws InterruptedException {
        auth(appkey, locDtos, request);
        if (Cools.isEmpty(locDtos)) {
            return R.parse(BaseRes.PARAM);
        }

        return openService.outbound(locDtos);
    }

    @PostMapping("/order/matSync/default/v1")
    @AppAuth(memo = "商品信息同步接口")
    public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,

 src/main/java/com/zy/asrs/entity/param/AgvGroupingParam.java

New file
@@ -0,0 +1,40 @@
package com.zy.asrs.entity.param;

import lombok.Data;

import java.util.List;

/**
 * @author pang.jiabao
 * @description agv组托调用入参
 * @createDate 2024/10/16 15:11
 */
@Data
public class AgvGroupingParam {
    // 单据编号
    private String billNo;

    // 单据编号
    private String orderNo;

    // 托盘条码
    private String barcode;

    private List<CombMat> combMats;

    @Data
    public static class CombMat {

        private Long detlId;

        // 序列码
        private String itemBatch;

        // 序列码
        private String batch;

        // 物料数量
        private Double anfme;

    }
}

 src/main/java/com/zy/asrs/service/OpenService.java

@@ -1,14 +1,26 @@
package com.zy.asrs.service;

import com.core.common.R;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
import com.zy.common.model.LocDto;

import java.util.List;

public interface OpenService {

    /**
     * AGV组托调用
     */
    R grouping(AgvGroupingParam param);

    /**
     * AGV出库调用
     */
    R outbound(List<LocDto> locDtos) throws InterruptedException;

    /**
     * 添加入库单
     */
    void pakinOrderCreate(OpenOrderPakinParam param);

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

@@ -1,8 +1,9 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -12,13 +13,15 @@
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.DetlDto;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -49,6 +52,135 @@
    @Autowired
    private TagMapper tagMapper;

    @Resource
    private WaitPakinService waitPakinService;

    @Resource
    private WrkDetlService wrkDetlService;

    @Resource
    private WorkService workService;

    @Resource
    private BasDevpService basDevpService;


    @Override
    @Transactional
    public R grouping(AgvGroupingParam param) {

        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }

        // 判断是否有相同条码的数据
        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
            throw new CoolException(param.getBarcode() + "数据正在进行入库");
        }

        if (param.getBarcode().length() != 8) {
            throw new CoolException("条码长度不是8位===>>" + param.getBarcode());
        }

        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
        int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
        if (countLoc > 0 || countWrk > 0 || countwait > 0) {
            throw new CoolException("组托档/工作档/库存条码数据已存在===>>" + param.getBarcode());
        }

        Date now = new Date();

        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("temp1", param.getOrderNo()));
        if (Cools.isEmpty(order) || order.getSettle() > 2) {
            throw new CoolException("单据编号已过期");
        }
        // 生成入库通知档
        param.getCombMats().forEach(elem -> {

            // 订单明细数量校验
            OrderDetl orderDetl = orderDetlService.selectById(elem.getDetlId());
            if (elem.getAnfme() > orderDetl.getEnableQty()) {
                throw new CoolException(orderDetl.getMatnr() + "入库数量不合法");
            }
            // 修改订单作业数量
            if (!orderDetlService.increaseWorkQty(orderDetl, elem.getAnfme())) {
                throw new CoolException("修改单据作业数量失败");
            }

            Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
            if (Cools.isEmpty(mat)) {
                throw new CoolException(orderDetl.getMatnr() + "商品档案不存在");
            }
            WaitPakin waitPakin = new WaitPakin();
            waitPakin.sync(mat);
            waitPakin.setOrderNo(order.getOrderNo());   // 单据编号
            waitPakin.setBatch(orderDetl.getBatch());     // 序列码
            waitPakin.setZpallet(param.getBarcode());   // 托盘码
            waitPakin.setIoStatus("N");     // 入出状态
            waitPakin.setAnfme(elem.getAnfme());  // 数量
            waitPakin.setStatus("Y");    // 状态
            waitPakin.setAppeTime(now);
            waitPakin.setModiTime(now);

            waitPakin.setBatch(orderDetl.getBatch());
            waitPakin.setSPgNO(orderDetl.getSPgNO());
            waitPakin.setOutOrderNo(orderDetl.getOutOrderNo());
            waitPakin.setProType(orderDetl.getProType());
            waitPakin.setLuHao(orderDetl.getLuHao());
            waitPakin.setPacking(orderDetl.getPacking());
            if (!waitPakinService.insert(waitPakin)) {
                throw new CoolException("保存入库通知档失败");
            }
        });

        orderService.updateSettle(order.getId(), 2L, null);
        return R.ok("组托成功");
    }

    @Override
    @Transactional
    public R outbound(List<LocDto> locDtos) throws InterruptedException {
        if (Cools.isEmpty(locDtos)) {
            return R.parse(BaseRes.PARAM);
        }
        boolean lack = true;
        for (LocDto locDto : locDtos) {
            if (!locDto.isLack()) {
                lack = false;
                break;
            }
        }
        if (lack) {
            return R.error("库存不足");
        }

        Thread.sleep(1000L);

        List<TaskDto> taskDtos = new ArrayList<>();
        // 根据 （库位 & 出库站） 分组； 理想状态：一组为一次出库任务
        for (LocDto locDto : locDtos) {
            if (locDto.isLack()) {
                continue;
            }
            TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
            if (TaskDto.has(taskDtos, taskDto)) {
                TaskDto dto = TaskDto.find(taskDtos, taskDto);
                assert dto != null;
                dto.getLocDtos().addAll(taskDto.getLocDtos());
            } else {
                taskDtos.add(taskDto);
            }
        }
        // -----------------------------------------------------------------------------------------------
        for (TaskDto taskDto : taskDtos) {
            BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
            workService.stockOut(staNo, taskDto, null);
        }
        return R.ok("出库成功");
    }

    @Override
    @Transactional
    public void pakinOrderCreate(OpenOrderPakinParam param) {