#pda组托+物料组托

zjj

2025-05-07 7791957685b2630fb0fd4a8c2b73e1867519a4f1

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

@@ -449,18 +449,19 @@
    public R getDeltByCode(Map<String, Object> params) {
        Object code = params.get("code");
        Object matnrCode = params.get("matnrCode");
        String batch = null;
        if (!Objects.isNull(params.get("batch"))) {
            batch = params.get("batch").toString();
        }
        Object asnCode = params.get("asnCode");
        Object batch = params.get("batch");

        //TODO 后续需根据策略配置，获取组拖数据。如：混装，按批次混装等
        LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()
                .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch,unit, stock_unit,  qty, work_qty, matnr_code, matnr_id, maktx").lambda()
                .eq(!Objects.isNull(code), WarehouseAreasItem::getTrackCode, code)
                .eq(StringUtils.isNotBlank(batch), WarehouseAreasItem::getSplrBatch, batch)
                .eq(!Objects.isNull(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode)
                .groupBy(WarehouseAreasItem::getSplrBatch, WarehouseAreasItem::getAsnId, WarehouseAreasItem::getAreaId, WarehouseAreasItem::getMatnrId);
        return R.ok(warehouseAreasItemService.list(queryWrapper));
        LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()
                .eq(!Cools.isEmpty(code), WarehouseAreasItem::getTrackCode, code)
                .eq(!Cools.isEmpty(batch), WarehouseAreasItem::getSplrBatch, batch)
                .eq(!Cools.isEmpty(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode)
                .eq(!Cools.isEmpty(asnCode), WarehouseAreasItem::getAsnCode, asnCode)
                ;
        List<WarehouseAreasItem> list = warehouseAreasItemService.list(queryWrapper);
        list.removeIf(e -> e.getAnfme() <= e.getWorkQty());
        return R.ok(list);
    }

    /**
@@ -836,9 +837,9 @@
     */
    @Override
    public R getItemByContainer(Map<String, Object> params) {
        if (Objects.isNull(params.get("code"))) {
            throw new CoolException("参数不能为空！！");
        }
//        if (Objects.isNull(params.get("code"))) {
//            throw new CoolException("参数不能为空！！");
//        }
        //获取组拖未生成任务的组拖档
        List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
        Short flagDefect = 0;
@@ -862,11 +863,8 @@
        } else {
            List<String> list = pakinItems.stream().map(WaitPakinItem::getTrackCode).collect(Collectors.toList());
            LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()
                    .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch, qty, work_qty, matnr_code, matnr_id, maktx")
                    .lambda()
                    .in(WarehouseAreasItem::getTrackCode, list)
                    .groupBy(WarehouseAreasItem::getSplrBatch,
                            WarehouseAreasItem::getTrackCode);
                    .in(WarehouseAreasItem::getTrackCode, list);
            List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);
            for (int i = 0; i < warehouseAreasItems.size(); i++) {
                for (WaitPakinItem pakinItem : pakinItems) {