云仓WMS接口流程

chen.lin

昨天 b003a49794f49a329e2702918ecfc8d14b371d0d

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java

@@ -4,22 +4,19 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.dto.ReceiptDetlsDto;
import com.vincent.rsf.server.common.config.SysStockProperties;
import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.DateUtils;
import com.vincent.rsf.server.manager.controller.params.WarehouseAreaParam;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.POExceStatus;
import com.vincent.rsf.server.manager.enums.PakinIOStatus;
import com.vincent.rsf.server.manager.enums.WarehouseAreasType;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.WarehouseAreasItemServiceImpl;
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.Config;
import com.vincent.rsf.server.system.entity.FieldsItem;
import com.vincent.rsf.server.system.service.ConfigService;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.impl.FieldsItemServiceImpl;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -30,10 +27,10 @@

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

/**
 * @author Ryan
@@ -58,14 +55,6 @@
    @Resource
    private SysStockProperties flowProperties;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private WaitPakinItemService waitPakinItemService;
    @Autowired
    private WaitPakinLogService waitPakinLogService;
    @Autowired
    private WaitPakinItemLogService waitPakinItemLogService;
    @Autowired
    private ConfigService configService;
    @Autowired
    private WarehouseAreasService warehouseAreasService;
@@ -73,130 +62,163 @@
    private WarehouseAreasItemServiceImpl warehouseAreasItemService;
    @Autowired
    private CompanysService companysService;
    @Autowired
    private TransferService transferService;
    @Autowired
    private OutStockService outStockService;
    @Autowired
    private FieldsItemService fieldsItemService;

    /**
     * @author Ryan
     * @date 2025/5/9
     * @description: 直接组托开关为true，将收货单直接加入临时库存
     * @version 1.0
     */
//    @Scheduled(cron = "0 0/05 * * * ?  ")
    @Scheduled(cron = "0/25 * * * * ?")
    @Transactional(rollbackFor = Exception.class)
    public synchronized void IgnoreReceipt() {
        Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.DIRECT_WAIT_PAKIN));
        if (Objects.isNull(config)) {
            return;
        }
        if (!Boolean.parseBoolean(config.getVal())) {
            return;
        }
        List<AsnOrder> orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val));
        if (!orders.isEmpty()) {
            for (AsnOrder order : orders) {
                List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
                if (orderItems.isEmpty()) {
                    return;
                }
                List<WarehouseAreasItem> items = new ArrayList<>();
                for (AsnOrderItem item : orderItems) {
                    WarehouseAreas one = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()
                            .eq(WarehouseAreas::getType, WarehouseAreasType.WAREHOUSE_AREAS_TYPE_RECEIPT.type), false);
                    Long areaId = Objects.isNull(one) ? null : one.getId();
                    String areaName = Objects.isNull(one) ? null : one.getName();

                    WarehouseAreasItem param = new WarehouseAreasItem();
                    BeanUtils.copyProperties(item, param);
                    param.setAreaId(one.getId())
                            .setAsnCode(order.getCode())
                            .setAreaId(areaId)
                            .setAreaName(areaName)
                            .setAsnId(order.getId());
                    items.add(param);
                    Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getId, item.getMatnrId()));
                    if (Objects.isNull(matnr)) {
                        throw new CoolException("物料不存在！！");
                    }
                    //更新收货区库存
                    extracted(one, item, order, matnr);

                    if (!asnOrderItemService.update(new LambdaUpdateWrapper<AsnOrderItem>().set(AsnOrderItem::getQty, item.getAnfme()).eq(AsnOrderItem::getId, item.getId()))) {
                        throw new CoolException("收货单明细完成数量修改失败！！");
                    }
                }
//                if (!warehouseAreasItemService.saveBatch(items)) {
//                    throw new CoolException("收货单保存至收货区执行失败！！");
//    /**
//     * @author Ryan
//     * @date 2025/5/9
//     * @description: 直接组托开关为true，将收货单直接加入临时库存
//     * @version 1.0
//     */
//    @Scheduled(cron = "0/25 * * * * ?")
//    @Transactional(rollbackFor = Exception.class)
//    public synchronized void IgnoreReceipt() {
//        Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.DIRECT_WAIT_PAKIN));
//        if (Objects.isNull(config)) {
//            return;
//        }
//        if (!Boolean.parseBoolean(config.getVal())) {
//            return;
//        }
//        //自动收货单
//        List<WkOrder> orders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
//                .eq(WkOrder::getType, OrderType.ORDER_IN.type)
//                .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val));
//         if (!orders.isEmpty()) {
//            for (WkOrder order : orders) {
//                if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)) {
//                    WkOrder one = outStockService.getOne(new LambdaQueryWrapper<WkOrder>()
//                            .eq(WkOrder::getPoCode, order.getPoCode())
//                            .eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type));
//                    if (Objects.isNull(one)) {
//                        throw new CoolException("数据错误");
//                    }
//                    if (!one.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val)) {
//                        continue;
//                    }
//                }

                if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>()
                        .set(AsnOrder::getQty, order.getAnfme())
                        .set(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val)
                        .eq(AsnOrder::getId, order.getId()))) {
                    throw new CoolException("收货单状态修改失败！！");
                }
            }
        }
    }
//
//                List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
//                if (orderItems.isEmpty()) {
//                    return;
//                }
//                // 收货区已停用：不再写入收货区，仅更新单据状态与数量
////                List<WarehouseAreas> receiptAreas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
////                        .eq(WarehouseAreas::getType, WarehouseAreasType.WAREHOUSE_AREAS_TYPE_RECEIPT.type));
////                WarehouseAreas receiptArea = receiptAreas.isEmpty() ? null : receiptAreas.get(0);
////                List<WarehouseAreasItem> items = new ArrayList<>();
//                for (WkOrderItem item : orderItems) {
////                    Long areaId = receiptArea == null ? null : receiptArea.getId();
////                    String areaName = receiptArea == null ? null : receiptArea.getName();
////                    WarehouseAreasItem param = new WarehouseAreasItem();
////                    BeanUtils.copyProperties(item, param);
////                    param.setAsnCode(order.getCode()).setAsnId(order.getId());
////                    if (areaId != null) {
////                        param.setAreaId(areaId).setAreaName(areaName);
////                    }
////                    items.add(param);
////                    Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getId, item.getMatnrId()));
////                    if (Objects.isNull(matnr)) {
////                        throw new CoolException("物料不存在！！");
////                    }
////                    if (receiptArea != null) {
////                        try {
////                            updateReceipt(receiptArea, item, order, matnr);
////                        } catch (Exception e) {
////                            throw new CoolException(e.getMessage());
////                        }
////                    }
//                    if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>().set(WkOrderItem::getQty, item.getAnfme()).eq(WkOrderItem::getId, item.getId()))) {
//                        throw new CoolException("收货单明细完成数量修改失败！！");
//                    }
//                }
////                if (!warehouseAreasItemService.saveBatch(items)) {
////                    throw new CoolException("收货单保存至收货区执行失败！！");
////                }
//
//                if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
//                        .set(WkOrder::getQty, order.getAnfme())
//                        .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val)
//                        .eq(WkOrder::getId, order.getId()))) {
//                    throw new CoolException("收货单状态修改失败！！");
//                }
//            }
//        }
//    }


    /**
    /** 收货区已停用，方法整体注释
     * @author Ryan
     * @date 2025/5/12
     * @description: 收货区库存更新
     * @version 1.0
     */
    private void extracted(WarehouseAreas areasItem, AsnOrderItem orderItem, AsnOrder asnOrder, Matnr matnr) {
        Companys companys = new Companys();
        if (StringUtils.isNoneBlank(orderItem.getSplrCode())) {
            companys = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, orderItem.getSplrCode()));
        }

        WarehouseAreasItem item = new WarehouseAreasItem();
        item.setTrackCode(orderItem.getBarcode())
                .setAreaName(areasItem.getName())
                .setAreaId(areasItem.getId())
                .setAsnItemId(orderItem.getId())
                .setAsnCode(asnOrder.getCode())
                .setAsnId(asnOrder.getId())
                .setProdTime(orderItem.getProdTime())
                .setPlatItemId(orderItem.getPlatItemId())
                .setPlatOrderCode(orderItem.getPlatOrderCode())
                .setPlatWorkCode(orderItem.getPlatWorkCode())
                .setProjectCode(orderItem.getProjectCode())
                .setSplrId(companys.getId())
                //库存单位为最小单位
                .setUnit(orderItem.getStockUnit())
                .setStockUnit(orderItem.getStockUnit())
                .setMatnrCode(matnr.getCode())
                .setAnfme(orderItem.getAnfme())
                .setMatnrId(matnr.getId())
                .setIsptResult(orderItem.getIsptResult())
                .setMaktx(matnr.getName())
                .setSplrBatch(orderItem.getSplrBatch())
                .setWeight(matnr.getWeight())
                .setFieldsIndex(orderItem.getFieldsIndex())
                .setShipperId(matnr.getShipperId());
        
        LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()
                .eq(WarehouseAreasItem::getMatnrCode, orderItem.getMatnrCode())
                .eq(!Cools.isEmpty(orderItem.getFieldsIndex()), WarehouseAreasItem::getFieldsIndex, orderItem.getFieldsIndex())
                .eq(WarehouseAreasItem::getAsnCode, orderItem.getAsnCode())
                .eq(StringUtils.isNotBlank(orderItem.getSplrBatch()), WarehouseAreasItem::getSplrBatch, orderItem.getSplrBatch());
        if (Objects.isNull(orderItem.getIsptResult())) {
            queryWrapper.isNull(WarehouseAreasItem::getIsptResult);
        } else {
            queryWrapper.eq(WarehouseAreasItem::getIsptResult, orderItem.getIsptResult());
        }
        WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(queryWrapper);
        if (!Objects.isNull(serviceOne)) {
            item.setId(serviceOne.getId());
            item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
        }
        //未质检
        if (!warehouseAreasItemService.saveOrUpdate(item)) {
            throw new CoolException("收货失败！！");
        }
    }
//    @Transactional(rollbackFor = Exception.class)
//    public void updateReceipt(WarehouseAreas areasItem, WkOrderItem orderItem, WkOrder wkOrder, Matnr matnr) throws Exception {
//        Companys companys = new Companys();
//        if (StringUtils.isNoneBlank(orderItem.getSplrCode())) {
//            companys = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, orderItem.getSplrCode()));
//        }
//        WarehouseAreasItem item = new WarehouseAreasItem();
//        item.setTrackCode(orderItem.getBarcode())
//                .setAreaName(areasItem.getName())
//                .setAreaId(areasItem.getId())
//                .setAsnItemId(orderItem.getId())
//                .setAsnCode(wkOrder.getCode())
//                .setAsnId(wkOrder.getId())
//                .setProdTime(orderItem.getProdTime())
//                .setPlatItemId(orderItem.getPlatItemId())
//                .setPlatOrderCode(orderItem.getPlatOrderCode())
//                .setPlatWorkCode(orderItem.getPlatWorkCode())
//                .setProjectCode(orderItem.getProjectCode())
//                .setSplrId(companys.getId())
//                .setUnit(orderItem.getStockUnit())
//                .setStockUnit(orderItem.getStockUnit())
//                .setMatnrCode(matnr.getCode())
//                .setAnfme(orderItem.getAnfme())
//                .setMatnrId(matnr.getId())
//                .setIsptResult(orderItem.getIsptResult())
//                .setMaktx(matnr.getName())
//                .setSplrBatch(orderItem.getSplrBatch())
//                .setWeight(matnr.getWeight())
//                .setFieldsIndex(orderItem.getFieldsIndex())
//                .setShipperId(matnr.getShipperId());
//        List<WarehouseAreasItem> warehousList = StringUtils.isNotBlank(orderItem.getFieldsIndex())
//                ? warehouseAreasItemService.list(new LambdaQueryWrapper<WarehouseAreasItem>().eq(WarehouseAreasItem::getFieldsIndex, orderItem.getFieldsIndex()))
//                : Collections.emptyList();
//        WarehouseAreasItem warehousItem = warehousList.isEmpty() ? null : warehousList.get(0);
//        if (!Objects.isNull(warehousItem)) {
//            List<FieldsItem> fieldsList = fieldsItemService.list(new LambdaQueryWrapper<FieldsItem>()
//                    .eq(FieldsItem::getUuid, orderItem.getFieldsIndex()).last("LIMIT 1"));
//            FieldsItem fieldsItem = fieldsList.isEmpty() ? null : fieldsList.get(0);
//            if (!Objects.isNull(fieldsItem)) {
//                throw new CoolException("票号：" + fieldsItem.getValue() + "已在收货区，不可推送相当票号数据。请联系管理员！！" );
//            }
//        }
//        LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()
//                .eq(WarehouseAreasItem::getMatnrCode, orderItem.getMatnrCode())
//                .eq(!Cools.isEmpty(orderItem.getFieldsIndex()), WarehouseAreasItem::getFieldsIndex, orderItem.getFieldsIndex())
//                .eq(WarehouseAreasItem::getAsnCode, orderItem.getOrderCode())
//                .eq(StringUtils.isNotBlank(orderItem.getSplrBatch()), WarehouseAreasItem::getSplrBatch, orderItem.getSplrBatch());
//        if (Objects.isNull(orderItem.getIsptResult())) {
//            queryWrapper.isNull(WarehouseAreasItem::getIsptResult);
//        } else {
//            queryWrapper.eq(WarehouseAreasItem::getIsptResult, orderItem.getIsptResult());
//        }
//        List<WarehouseAreasItem> serviceList = warehouseAreasItemService.list(queryWrapper);
//        WarehouseAreasItem serviceOne = serviceList.isEmpty() ? null : serviceList.get(0);
//        if (!Objects.isNull(serviceOne)) {
//            item.setId(serviceOne.getId());
//            item.setAnfme(orderItem.getAnfme());
//        }
//        if (!warehouseAreasItemService.saveOrUpdate(item)) {
//            throw new CoolException("收货失败！！");
//        }
//    }


    /**
@@ -231,7 +253,7 @@
            if (items.isEmpty()) {
                throw new CoolException("子列表数据为空，请查询PO单是否正确录入！！");
            }
            AsnOrder order = new AsnOrder();
            WkOrder order = new WkOrder();
            //根据编码规则生成ASN单号
            String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, purchase);
            order.setAnfme(purchase.getAnfme())
@@ -243,9 +265,9 @@
            if (!asnOrderService.save(order)) {
                throw new CoolException("ASN单据保存失败！！");
            }
            List<AsnOrderItem> orderItems = new ArrayList<>();
            List<WkOrderItem> orderItems = new ArrayList<>();
            items.forEach(item -> {
                AsnOrderItem orderItem = new AsnOrderItem();
                WkOrderItem orderItem = new WkOrderItem();
                Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode()));
                if (Objects.isNull(matnr)) {
                    throw new CoolException("数据错误：当前物料不存在!!");
@@ -256,10 +278,10 @@
                }
//                String barcode = code + matnr.getCode();
                orderItem.setAnfme(item.getAnfme())
                        .setAsnId(order.getId())
                        .setOrderId(order.getId())
                        .setQty(item.getQty())
                        .setSplrName(item.getSplrName())
                        .setAsnCode(code)
                        .setOrderCode(code)
                        .setSplrCode(item.getSplrCode())
                        .setPoDetlId(item.getId())
                        .setPlatItemId(item.getPlatItemId())
@@ -296,13 +318,13 @@
    @Scheduled(cron = "0 0/05 * * * ?  ")
    @Transactional(rollbackFor = Exception.class)
    public void generateMatnrLabel() {
        List<AsnOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
                .isNull(AsnOrderItem::getTrackCode)
                .select(AsnOrderItem::getId));
        List<WkOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
                .isNull(WkOrderItem::getTrackCode)
                .select(WkOrderItem::getId));
        if (Objects.isNull(list) || list.isEmpty()) {
            return;
        }
        List<AsnOrderItem> items = new ArrayList<>();
        List<WkOrderItem> items = new ArrayList<>();
        list.forEach(item -> {
            String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
            if (StringUtils.isBlank(trackCode)) {
@@ -317,62 +339,4 @@
            throw new CoolException("生成编码失败！！");
        }
    }

    /**
     * @param
     * @return
     * @author Ryan
     * @description 组拖历史档
     * @time 2025/3/29 12:36
     */
    @Scheduled(cron = "0/25 * * * * ?")
    @Transactional(rollbackFor = Exception.class)
    public void pakinLog() {
        List<WaitPakin> pakinIds = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>()
                .eq(WaitPakin::getIoStatus, Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val))
                .select(WaitPakin::getId));
        if (pakinIds.isEmpty()) {
            return;
        }
        List<Long> list = pakinIds.stream().map(WaitPakin::getId).collect(Collectors.toList());
        List<WaitPakin> pakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().in(WaitPakin::getId, list));
        if (pakins.isEmpty()) {
            throw new CoolException("组拖单为空！！");
        }
        pakins.forEach(pakin -> {
            WaitPakinLog log = new WaitPakinLog();
            BeanUtils.copyProperties(pakin, log);
            log.setPakinId(pakin.getId()).setIoStatus(PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val);

            if (!waitPakinLogService.save(log)) {
                throw new CoolException("组托日志保存失败！！");
            }
            List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getPakinId, pakin.getId()));
            if (pakinItems.isEmpty()) {
                throw new CoolException("组拖明细为空！！");
            }
            List<WaitPakinItemLog> itemLogs = new ArrayList<>();

            pakinItems.forEach(item -> {
                WaitPakinItemLog itemLog = new WaitPakinItemLog();
                BeanUtils.copyProperties(item, itemLog);
                itemLog.setPakinItemId(item.getId())
                        .setLogId(log.getId())
                        .setPakinId(item.getPakinId());
                itemLogs.add(itemLog);
            });

            if (!waitPakinItemLogService.saveBatch(itemLogs)) {
                throw new CoolException("历史明细档保存失败！！");
            }
        });

        if (!waitPakinService.removeByIds(list)) {
            throw new CoolException("原单据删除失败！！");
        }
        if (!waitPakinItemService.remove(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getPakinId, list))) {
            throw new CoolException("原单据明细删除失败！！");
        }
    }

}