mes调用立即出库修改

pang.jiabao

2024-10-25 2f63acadcd111fe47b2feedf13adb9cffcd64b2c

mes调用立即出库修改

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

@@ -74,13 +74,13 @@
    @AppAuth(memo = "MES调用出库")
    public synchronized R outbound(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) OutBoundParam param,
                                      HttpServletRequest request) throws InterruptedException {
                                      HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param.getEndLocation(),param.getLocDtos())) {
        if (Cools.isEmpty(param.getEndLocation(),param.getBarcode(),param.getOrderNo())) {
            return R.parse(BaseRes.PARAM);
        }

        return openService.outbound(param.getLocDtos(),param.getEndLocation());
        return openService.outbound(param);
    }

    @PostMapping("/order/matSync/default/v1")

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

@@ -1,9 +1,6 @@
package com.zy.asrs.entity.param;

import com.zy.common.model.LocDto;
import lombok.Data;

import java.util.List;

/**
 * @author pang.jiabao
@@ -12,13 +9,20 @@
 */
@Data
public class OutBoundParam {

    /**
     * 单据编号
     */
    private String orderNo;

    /**
     * 托盘码
     */
    private String barcode;

    /**
     * 地码
     */
    private String endLocation;

    /**
     * 物料明细
     */
    private List<LocDto> locDtos;
}

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

@@ -4,7 +4,6 @@
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;

@@ -23,7 +22,7 @@
    /**
     * MES调用出库
     */
    R outbound(List<LocDto> locDtos,String endLocation) throws InterruptedException;
    R outbound(OutBoundParam param);

    /**
     * 添加入库单

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

@@ -12,9 +12,10 @@
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatCompareUtils;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,9 +23,9 @@
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
 * Created by vincent on 2022/4/9
@@ -63,6 +64,18 @@

    @Resource
    private BasDevpService basDevpService;

    @Resource
    private LocMastService locMastService;

    @Resource
    private StaDescService staDescService;

    @Resource
    private CommonService commonService;

    @Resource
    private WrkMastService wrkMastService;


    @Override
@@ -163,42 +176,114 @@

    @Override
    @Transactional
    public R outbound(List<LocDto> locDtos,String endLocation) throws InterruptedException {
        if (Cools.isEmpty(locDtos)) {
            return R.parse(BaseRes.PARAM);
    public R outbound(OutBoundParam param) {

        // 托盘码
        String barcode = param.getBarcode();

        // 单据编号
        String orderNo = param.getOrderNo();

        // 根据托盘码查询库存明细
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", barcode));
        List<String> locNos = locDetls.stream().map(LocDetl::getLocNo).distinct().collect(Collectors.toList());
        if (locDetls.size() == 0) {
            return R.parse("该托盘码不存在库存：" + barcode);
        } else if (locNos.size() > 1) {
            return R.parse("该托盘码有多个库位：" + barcode);
        }
        boolean lack = true;
        for (LocDto locDto : locDtos) {
            if (!locDto.isLack()) {
                lack = false;

        // 库位号
        String locNo = locNos.get(0);

        // 出库站点
        Integer outSite = null;
        List<BasDevp> devps = basDevpService.selectList(new EntityWrapper<BasDevp>().in("dev_no", 223, 123));
        for (BasDevp basDevp : devps) {
            // 无工作号，无物
            if (basDevp.getWrkNo() == 0 && basDevp.getLoading().equals("N")) {
                outSite = basDevp.getDevNo();
                break;
            }
        }
        if (lack) {
            return R.error("库存不足");
        if (outSite == null) {
            outSite = 123;
        }

        Thread.sleep(1000L);
        Date now = new Date();

        List<TaskDto> taskDtos = new ArrayList<>();
        // 根据 （库位 & 出库站） 分组； 理想状态：一组为一次出库任务
        for (LocDto locDto : locDtos) {
            if (locDto.isLack()) {
                continue;
        // 获取单据
        Order order = orderService.selectByNo(orderNo);
        // 获取单据明细
        List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());

        // 对比库存明细和出库单据明细是否一致
        boolean flag = MatCompareUtils.compareAndCheckCancellation(locDetls, orderDetlList);
        if (!flag) {
            return R.parse("库存明细和单据明细不一致，请检查，单据编号：" + orderNo);
        }

        // 获取库位
        LocMast locMast = locMastService.selectById(locNo);
        // 获取路径
        int ioType = 101;
        StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), outSite);
        // 生成工作号
        int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setInvWh(param.getEndLocation()); // 地码
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
        wrkMast.setIoType(ioType); // 入出库状态
        wrkMast.setIoPri(13D); // 优先级：13
        wrkMast.setCrnNo(locMast.getCrnNo());
        wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
        wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
        wrkMast.setSourceLocNo(locNo); // 源库位
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setLinkMis("N");
        wrkMast.setBarcode(barcode);
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        if (!wrkMastService.insert(wrkMast)) {
            throw new CoolException("保存工作档失败，出库库位号：" + locNo);
        }

        // 生成工作档明细
        for (OrderDetl orderDetl : orderDetlList) {

            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.setWrkNo(workNo);
            wrkDetl.sync(orderDetl);
            wrkDetl.setZpallet(wrkMast.getBarcode());
            wrkDetl.setIoTime(now);
            wrkDetl.setOrderNo(orderNo);
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作档明细失败");
            }
            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);
            // 修改订单明细
            if (!orderDetlService.increaseWorkQty(orderDetl, orderDetl.getAnfme())) {
                throw new CoolException("修改订单明细数量失败");
            }
        }
        // -----------------------------------------------------------------------------------------------
        for (TaskDto taskDto : taskDtos) {
            BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
            workService.stockOut(staNo, taskDto, null, endLocation);
        // 修改订单状态
        orderService.updateSettle(order.getId(), 2L, null);
        // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
        if (locMast.getLocSts().equals("F")) {
            locMast.setLocSts("R");
            locMast.setModiTime(now);
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("预约库位状态失败，库位号：" + locNo);
            }
        } else {
            throw new CoolException(locNo + "库位不是在库状态");
        }
        return R.ok("出库成功");
    }

 src/main/java/com/zy/asrs/utils/MatCompareUtils.java

@@ -1,12 +1,16 @@
package com.zy.asrs.utils;

import com.core.common.Cools;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetl;
import com.zy.common.model.LocDto;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

/**
 * 用户物料信息比对，判断是否为同一物料
@@ -33,6 +37,36 @@
        return true;
    }

    /**
     * 比较两个集合的类的属性，相同则抵消，最后判断两个集合是否完全抵消
     */
    public static boolean compareAndCheckCancellation(List<LocDetl> list1, List<OrderDetl> list2) {
        if (list1.size() != list2.size()) {
            return false; // If lists are not of the same size, cancellation is not possible
        }

        List<OrderDetl> remainingList2 = new ArrayList<>(list2);

        // Compare and cancel out elements
        for (LocDetl p1 : list1) {
            boolean cancelled = false;
            for (OrderDetl p2 : remainingList2) {
                if (Objects.equals(p1.getMatnr(),p2.getMatnr()) && Objects.equals(p1.getBatch(),p2.getBatch()) && Objects.equals(p1.getOutOrderNo(),p2.getOutOrderNo()) &&
                        Objects.equals(p1.getLuHao(),p2.getLuHao()) && Objects.equals(p1.getPacking(),p2.getPacking()) && Objects.equals(p1.getSPgNO(),p2.getSPgNO()) &&
                        Objects.equals(p1.getProType(),p2.getProType()) && Objects.equals(p1.getColor(),p2.getColor())) {
                    remainingList2.remove(p2);
                    cancelled = true;
                    break;
                }
            }
            if (!cancelled) {
                return false; // If any element in list1 cannot be cancelled, return false
            }
        }

        return remainingList2.isEmpty(); // Return true if all elements in list1 were cancelled out
    }

    private static boolean isSame(Object fieldValue1, Object fieldValue2) {
        if (Cools.isEmpty(fieldValue1)) {
            fieldValue1 = "";