标准版WMS
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
skyouc
7 天以前 6fd5d255ffb664241ac081b6b09fc1cda32abd7f 
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java


@@ -444,18 +444,18 @@


    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);


    }




    /**


@@ -469,11 +469,6 @@


    @Override


    public WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId) {


        return waitPakinService.mergeItems(waitPakin, userId);


    }




    @Override


    public WaitPakin mergeMatnrItems(WaitPakinParam waitPakin, Long userId) {


        return waitPakinService.mergeMatnrItems(waitPakin, userId);


    }




    /**


@@ -701,6 +696,8 @@


        stock.setAnfme(sum)


                .setSourceId(order.getId())


                .setType(order.getType())


                .setUpdateBy(loginUserId)


                .setCreateBy(loginUserId)


                .setWkType(Short.parseShort(order.getWkType()));


        if (!stockService.save(stock)) {


            throw new CoolException("库存保存失败！！");


@@ -719,6 +716,8 @@


                    .setId(null)


                    .setLocCode(loc.getCode())


                    .setOrderId(order.getId())


                    .setUpdateBy(loginUserId)


                    .setUpdateBy(loginUserId)


                    .setOrderItemId(asnOrderItem.getId())


                    .setWkType(Short.parseShort(order.getWkType()))


                    .setType(order.getType());


@@ -836,9 +835,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;


@@ -976,6 +975,7 @@


                    .setSplrBatch(asnOrderItem.getSplrBatch())


                    .setMatnr(asnOrderItem.getMatnrCode())


                    .setInspect(asnOrderItem.getIsptResult$()) //质检结果


                    .setPlatItemId(asnOrderItem.getPlatItemId())


            ;




            Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId());