云仓WMS接口

chen.lin

2 天以前 9140aee230de0ef41de9682a9353fbd372e2bcaa

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java

@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.erp.params.*;
@@ -68,6 +69,8 @@
    @Autowired
    private AsnOrderService asnOrderService;
    @Autowired
    private AsnOrderLogService asnOrderLogService;
    @Autowired
    private AsnOrderItemService asnOrderItemService;
    @Autowired
    private DeliveryService deliveryService;
@@ -99,6 +102,8 @@
    private DictDataService dictDataService;
    @Autowired
    private DictTypeService dictTypeService;
    @Autowired
    private LocItemService locItemService;


    /**
@@ -225,11 +230,20 @@
    @Override
    public R queryOrderStatus(QueryOrderParam queryParams) {
        WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                .eq(WkOrder::getCode, queryParams.getOrderNo())
                .eq(StringUtils.isNotBlank(queryParams.getType()), WkOrder::getType, queryParams.getType()));
                .eq(WkOrder::getPoCode, queryParams.getOrderNo()));
        if (Objects.isNull(wkOrders)) {
            throw new CoolException("单据不存在！！");
            Map<String, Object> map = new HashMap<>();
            map.put("exceStatus", "-1");
            return R.ok("单据不存在 ！！").add(map);
        }

        AsnOrderLog orderLog = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, queryParams.getOrderNo()));
        if (!Objects.isNull(orderLog)) {
            Map<String, Object> map = new HashMap<>();
            map.put("exceStatus", "4");
            return R.ok("单据已完成 ！！").add(map);
        }

        List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, wkOrders.getId()));

        WkOrderDto wkorderDto = new WkOrderDto();
@@ -396,63 +410,79 @@
            syncOrders.forEach(syncOrder -> {
                WkOrder wkOrder = new WkOrder();
                DictData one = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE)
                        .eq(DictData::getLabel, syncOrder.getWkType()), false);
                        .eq(DictData::getValue, syncOrder.getWkType()), false);
                if (Objects.isNull(one)) {
                    throw new CoolException("单据：" + syncOrder.getOrderNo() + ", 业务类型不存在！！");
                }
                WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                        .eq(!Objects.isNull(syncOrder.getOrderId()), WkOrder::getPoId, syncOrder.getOrderId())
                        .eq(WkOrder::getPoCode, syncOrder.getOrderNo()));
                if (!Objects.isNull(order)) {
                    if (order.getExceStatus().equals(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val) ||
                            order.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)) {
                        /**删除单据明细*/
                        asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
                        /**删除主单*/
                        asnOrderService.removeById(order.getId());
                    } else {
                        throw new CoolException("单据已添加，不可执行修改或添加操作！！");
                Loc serviceOne = null;
                if (!Objects.isNull(syncOrder.getOrgLoc())) {
                    serviceOne = locService.getOne(new LambdaQueryWrapper<Loc>().eq(!Objects.isNull(syncOrder.getOrgLoc()), Loc::getCode, syncOrder.getOrgLoc()));
                }
                if (!Objects.isNull(serviceOne)) {
                    //TODO 添加调拔移库单功能
                } else {
                    WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                            .eq(!Objects.isNull(syncOrder.getOrderId()), WkOrder::getPoId, syncOrder.getOrderId())
                            .eq(WkOrder::getPoCode, syncOrder.getOrderNo()));
                    if (!Objects.isNull(order)) {
                        if (order.getExceStatus().equals(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val) ||
                                order.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)) {
                            /**删除单据明细*/
                            asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
                            /**删除主单*/
                            asnOrderService.removeById(order.getId());
                        } else {
                            throw new CoolException("单据已添加，不可执行修改或添加操作！！");
                        }
                    }
                }
                String rule = SerialRuleCode.SYS_ASN_ORDER;
                if (syncOrder.getType().equals(OrderType.ORDER_OUT.type)) {
                    rule = SerialRuleCode.SYS_OUT_STOCK_CODE;
                }

                String ruleCode = SerialRuleUtils.generateRuleCode(rule, null);
                wkOrder.setType(syncOrder.getType())
                        .setWkType(OrderWorkType.getWorkType(syncOrder.getWkType()))
                        .setAnfme(syncOrder.getAnfme())
                        .setPoCode(syncOrder.getOrderNo())
                        .setPoId(syncOrder.getOrderId())
                        .setCode(ruleCode)
                        .setArrTime(syncOrder.getArrTime())
                        .setId(null)
                        .setCreateTime(new Date())
                        .setUpdateTime(new Date())
                        .setCreateBy(loginUserId)
                        .setUpdateBy(loginUserId);
                if (!asnOrderService.save(wkOrder)) {
                    throw new CoolException("单据保存失败！！");
                }

                syncOrder.getOrdersItems().forEach(orderItem -> {
                    Map<String, Object> map = new ObjectMapper().convertValue(orderItem, Map.class);
                    map.put("orderId", wkOrder.getId());
                    map.put("poId", wkOrder.getPoId());
                    map.put("poCode", wkOrder.getPoCode());
                    map.put("order_code", wkOrder.getCode());

                    if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
                        throw new CoolException("明细保存失败！！");
                    String rule = SerialRuleCode.SYS_ASN_ORDER;
                    if (syncOrder.getType().equals(OrderType.ORDER_OUT.type)) {
                        rule = SerialRuleCode.SYS_OUT_STOCK_CODE;
                    }
                });
                List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getOrderId, wkOrder.getId()));
                double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
                wkOrder.setAnfme(sum);
                if (!asnOrderService.updateById(wkOrder)) {
                    throw new CoolException("计划收货数量修改失败！！");

                    String ruleCode = SerialRuleUtils.generateRuleCode(rule, null);
                    wkOrder.setType(syncOrder.getType())
                            .setWkType(one.getValue())
                            .setAnfme(syncOrder.getAnfme())
                            .setPoCode(syncOrder.getOrderNo())
                            .setWorkQty(0.0)
                            .setQty(0.0)
                            .setPoId(syncOrder.getOrderId())
                            .setCode(ruleCode)
                            .setArrTime(syncOrder.getArrTime())
                            .setId(null)
                            .setCreateTime(new Date())
                            .setUpdateTime(new Date())
                            .setCreateBy(loginUserId)
                            .setUpdateBy(loginUserId);

                    if (syncOrder.getType().equals(OrderType.ORDER_OUT.type)){
                        wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
                    }

                    if (!asnOrderService.save(wkOrder)) {
                        throw new CoolException("单据保存失败！！");
                    }

                    syncOrder.getOrderItems().forEach(orderItem -> {
                        Map<String, Object> map = new ObjectMapper().convertValue(orderItem, Map.class);
                        map.put("orderId", wkOrder.getId());
                        map.put("poId", wkOrder.getPoId());
                        map.put("poCode", wkOrder.getPoCode());
                        map.put("order_code", wkOrder.getCode());
                        map.put("matnrCode", orderItem.getMatnr());

                        if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
                            throw new CoolException("明细保存失败！！");
                        }
                    });
                    List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
                            .eq(WkOrderItem::getOrderId, wkOrder.getId()));
                    double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
                    wkOrder.setAnfme(sum);
                    if (!asnOrderService.updateById(wkOrder)) {
                        throw new CoolException("计划收货数量修改失败！！");
                    }
                }
            });
        }
@@ -619,7 +649,7 @@
            if (Objects.isNull(wkOrder)) {
                throw new CoolException("请确认单据：" + order.getOrderNo() + "是否已经执行或是否同步！！");
            }
            order.getOrdersItems().forEach(orderItem -> {
            order.getOrderItems().forEach(orderItem -> {
                WkOrderItem wkOrderItem = asnOrderItemService.getOne(new LambdaUpdateWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getMatnrCode, orderItem.getMatnr())
                        .eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
@@ -669,7 +699,7 @@
            if (Objects.isNull(wkOrder)) {
                throw new CoolException("订单：" + wkOrder.getCode() + "，当前状态，不可执行删除操作！！");
            }
            order.getOrdersItems().forEach(orderItem -> {
            order.getOrderItems().forEach(orderItem -> {
                if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getMatnrCode, orderItem.getMatnr())
                        .eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
@@ -746,41 +776,54 @@
    }

    /**
     * 基础物料信息变更
     * @param baseMatParms
     * @return
     * 基础物料信息变更（对接协议 8.2）
     * operateType：1新增 2修改 3禁用 4启用；不传或 1/2 时按有则更新、无则新增。
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R matUpdate(BaseMatParms baseMatParms) {
        if (StringUtils.isNotBlank(baseMatParms.getMatnr())) {
            throw new CoolException("基础信息变更失败！！");
        if (StringUtils.isBlank(baseMatParms.getMatnr())) {
            throw new CoolException("物料编码不能为空！！");
        }
        Integer operateType = baseMatParms.getOperateType();
        // 3 禁用 / 4 启用：仅更新状态（status 1 正常 0 冻结）
        if (Integer.valueOf(3).equals(operateType) || Integer.valueOf(4).equals(operateType)) {
            Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, baseMatParms.getMatnr()));
            if (matnr == null) {
                throw new CoolException("物料不存在，无法执行禁用/启用！！");
            }
            int status = Integer.valueOf(4).equals(operateType) ? 1 : 0; // 4 启用=1 正常，3 禁用=0 冻结
            matnr.setStatus(status);
            if (!matnrService.updateById(matnr)) {
                throw new CoolException(operateType == 4 ? "物料启用失败！！" : "物料禁用失败！！");
            }
            return R.ok();
        }
        // 1 新增 / 2 修改 / 不传：有则更新、无则新增
        Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, baseMatParms.getMatnr()));
        if (Objects.isNull(matnr)) {
            BeanUtils.copyProperties(baseMatParms, matnr);
            matnr.setCode(baseMatParms.getMatnr());
            matnr.setName(baseMatParms.getMaktx());
            Matnr matnr1 = new Matnr();
            BeanUtils.copyProperties(baseMatParms, matnr1);
            matnr1.setCode(baseMatParms.getMatnr());
            matnr1.setName(baseMatParms.getMaktx());
            if (!Objects.isNull(baseMatParms.getGroupName())) {
                MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>()
                        .eq(MatnrGroup::getName, baseMatParms.getGroupName()));
                if (Objects.isNull(matnrGroup)) {
                    matnr.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());
                if (!Objects.isNull(matnrGroup)) {
                    matnr1.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());
                }
            }
            if (!matnrService.save(matnr)) {
            if (!matnrService.save(matnr1)) {
                throw new CoolException("物料新增失败！！");
            }
        } else {

            if (!Objects.isNull(baseMatParms.getGroupName())) {
                MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>()
                        .eq(MatnrGroup::getName, baseMatParms.getGroupName()));
                if (Objects.isNull(matnrGroup)) {
                if (!Objects.isNull(matnrGroup)) {
                    matnr.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());
                }
            }

            matnr.setName(baseMatParms.getMaktx())
                    .setColor(baseMatParms.getColor())
                    .setModel(baseMatParms.getModel())
@@ -793,4 +836,118 @@

        return R.ok();
    }

    @Override
    public R inventoryDetails(InventoryDetailsParam param) {
        LambdaQueryWrapper<LocItem> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(LocItem::getDeleted, 0);
        if (!Cools.isEmpty(param.getLocId())) {
            wrapper.eq(LocItem::getLocCode, param.getLocId());
        }
        if (!Cools.isEmpty(param.getMatNr())) {
            wrapper.eq(LocItem::getMatnrCode, param.getMatNr());
        }
        if (!Cools.isEmpty(param.getBatch())) {
            wrapper.eq(LocItem::getBatch, param.getBatch());
        }
        if (!Cools.isEmpty(param.getOrderNo())) {
            wrapper.and(w -> w.eq(LocItem::getPlatOrderCode, param.getOrderNo()).or().eq(LocItem::getPlatWorkCode, param.getOrderNo()));
        }
        if (!Cools.isEmpty(param.getPlanNo())) {
            wrapper.eq(LocItem::getPlatWorkCode, param.getPlanNo());
        }
        if (!Cools.isEmpty(param.getWareHouseId())) {
            Warehouse wh = warehouseService.getOne(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, param.getWareHouseId()));
            if (wh != null) {
                List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, wh.getId()));
                if (!locs.isEmpty()) {
                    wrapper.in(LocItem::getLocId, locs.stream().map(Loc::getId).collect(Collectors.toList()));
                } else {
                    return R.ok().add(Collections.emptyList());
                }
            } else {
                return R.ok().add(Collections.emptyList());
            }
        }
        List<LocItem> list = locItemService.list(wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (LocItem item : list) {
            Map<String, Object> row = new LinkedHashMap<>();
            row.put("locId", item.getLocCode());
            Loc loc = locService.getById(item.getLocId());
            if (loc != null && loc.getWarehouseId() != null) {
                Warehouse w = warehouseService.getById(loc.getWarehouseId());
                row.put("wareHouseId", w != null ? w.getCode() : null);
                row.put("wareHouseName", w != null ? w.getName() : null);
            } else {
                row.put("wareHouseId", null);
                row.put("wareHouseName", null);
            }
            row.put("palletId", item.getTrackCode());
            row.put("matNr", item.getMatnrCode());
            row.put("makTx", item.getMaktx());
            row.put("anfme", item.getAnfme() != null ? item.getAnfme() : 0);
            row.put("unit", item.getUnit());
            row.put("status", item.getStatus() != null ? item.getStatus() : 1);
            row.put("orderType", item.getWkType());
            row.put("orderNo", item.getPlatOrderCode());
            row.put("planNo", item.getPlatWorkCode());
            row.put("batch", item.getBatch());
            result.add(row);
        }
        return R.ok().add(result);
    }

    @Override
    public R inventorySummary(InventorySummaryParam param) {
        LambdaQueryWrapper<LocItem> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(LocItem::getDeleted, 0).select(LocItem::getLocId, LocItem::getMatnrCode, LocItem::getMaktx, LocItem::getAnfme, LocItem::getUnit);
        if (!Cools.isEmpty(param.getWareHouseId())) {
            Warehouse wh = warehouseService.getOne(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, param.getWareHouseId()));
            if (wh != null) {
                List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, wh.getId()));
                if (!locs.isEmpty()) {
                    wrapper.in(LocItem::getLocId, locs.stream().map(Loc::getId).collect(Collectors.toList()));
                } else {
                    return R.ok().add(Collections.emptyList());
                }
            } else {
                return R.ok().add(Collections.emptyList());
            }
        }
        if (!Cools.isEmpty(param.getMatNr())) {
            List<String> matNrs = Arrays.asList(param.getMatNr().split(","));
            wrapper.in(LocItem::getMatnrCode, matNrs.stream().map(String::trim).collect(Collectors.toList()));
        }
        List<LocItem> list = locItemService.list(wrapper);
        Map<String, Map<String, Object>> sumMap = new LinkedHashMap<>();
        for (LocItem item : list) {
            Loc loc = locService.getById(item.getLocId());
            String whId = null;
            String whName = null;
            if (loc != null && loc.getWarehouseId() != null) {
                Warehouse w = warehouseService.getById(loc.getWarehouseId());
                whId = w != null ? w.getCode() : null;
                whName = w != null ? w.getName() : null;
            }
            String key = (whId != null ? whId : "") + "|" + (item.getMatnrCode() != null ? item.getMatnrCode() : "");
            final String finalWhId = whId;
            final String finalWhName = whName;
            sumMap.compute(key, (k, v) -> {
                if (v == null) {
                    v = new LinkedHashMap<>();
                    v.put("wareHouseId", finalWhId);
                    v.put("wareHouseName", finalWhName);
                    v.put("matNr", item.getMatnrCode());
                    v.put("matTx", item.getMaktx());
                    v.put("anfme", (item.getAnfme() != null ? item.getAnfme() : 0));
                    v.put("unit", item.getUnit());
                } else {
                    v.put("anfme", ((Number) v.get("anfme")).doubleValue() + (item.getAnfme() != null ? item.getAnfme() : 0));
                }
                return v;
            });
        }
        return R.ok().add(new ArrayList<>(sumMap.values()));
    }
}