blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zjj
2025-05-06 46586e4f4926cf0f599edf181d06b52a402cbb6e 
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java


@@ -47,6 +47,7 @@




import javax.annotation.Resource;


import javax.servlet.http.HttpServletRequest;


import java.math.BigDecimal;


import java.nio.charset.StandardCharsets;


import java.util.*;


import java.util.stream.Collectors;


@@ -197,7 +198,7 @@


     */


    @Override


    @Transactional(rollbackFor = Exception.class)


    public R receiptToWarehouse(Map<String, Object> params, Long loginUserId) {


    public synchronized R receiptToWarehouse(Map<String, Object> params, Long loginUserId) {


        if (Objects.isNull(params)) {


            throw new CoolException("参数不能为空！！");


        }


@@ -216,7 +217,6 @@


        }




        List<ReceiptDetlsDto> receipts = receiptParam.getReceipts();


        List<WarehouseAreasItem> allOrders = new ArrayList<>();




        Double receiptQty = receipts.stream().mapToDouble(ReceiptDetlsDto::getReceiptQty).sum();




@@ -266,7 +266,8 @@


            }


            Double itemRcptQty = dto.getReceiptQty() + orderItem.getQty();


            orderItem.setQty(itemRcptQty)


                    .setSplrBatch(dto.getSplrBatch())


//                    .setSplrBatch(dto.getSplrBatch())


                    .setUpdateBy(loginUserId)


                    .setStockUnit(dto.getStockUnit())


                    .setProdTime(dto.getProdTime());




@@ -331,23 +332,17 @@


            if (!warehouseAreasItemService.saveOrUpdate(item)) {


                throw new CoolException("收货失败！！");


            }




        }




//        if (!warehouseAreasItemService.saveBatch(allOrders)) {


//            throw new CoolException("收货失败！！");


//        }


//        //获取采购数量


//        double purQty = receipts.stream().mapToDouble(ReceiptDetlsDto::getPurQty).sum();


//


//        BigDecimal subtract = BigDecimal.valueOf(receiptQty).subtract(BigDecimal.valueOf(purQty));


//        //判断已收货数量是否小于等于采购数量


//        if (subtract.compareTo(new BigDecimal("0.0")) <= 0) {


//            asnOrder.setRleStatus(Short.valueOf("1"));


//            //日志表操作


//            operateOrderLogs(asnOrder);


//        }


        return R.ok(asnOrder);


        AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, asnCode));


        if (order.getQty().compareTo(order.getAnfme()) >= 0.00) {


            order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val).setRleStatus(Short.valueOf("1"));


            if (!asnOrderMapper.updateById(order)) {


                throw new CoolException("订单状态修改失败！！");


            }


        }




        return R.ok("收货成功！！");


    }




    /**


@@ -363,7 +358,9 @@


        }


        List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()


                .eq(AsnOrderItem::getAsnCode, params.getAsnCode())


                .eq(!Objects.isNull(params.getTrackCode()), AsnOrderItem::getTrackCode, params.getTrackCode()));


                .eq(!Objects.isNull(params.getTrackCode()), AsnOrderItem::getTrackCode, params.getTrackCode())


                .eq(!Cools.isEmpty(params.getMatnrCode()), AsnOrderItem::getMatnrCode, params.getMatnrCode())


        );




        if (Objects.isNull(asnOrderItem)) {


            throw new CoolException("单据明细不存在！！");


@@ -425,13 +422,19 @@


     * @time 2025/4/7 16:58


     */


    @Override


    public R getDeltByCode(String code) {


    public R getDeltByCode(Map<String, Object> params ) {


        String code = params.get("code").toString();


        String batch = null;


        if (!Objects.isNull(params.get("batch"))) {


            batch = params.get("batch").toString();


        }


        //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, qty, work_qty, matnr_code, matnr_id, maktx").lambda()


                .eq(WarehouseAreasItem::getTrackCode, code)


                .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(StringUtils.isNotBlank(code), WarehouseAreasItem::getTrackCode, code)


                .eq(StringUtils.isNotBlank(batch), WarehouseAreasItem::getSplrBatch, batch)


                .groupBy(WarehouseAreasItem::getSplrBatch, WarehouseAreasItem::getAsnId, WarehouseAreasItem::getAreaId, WarehouseAreasItem::getMatnrId);


        return R.ok(warehouseAreasItemService.getOne(queryWrapper));


        return R.ok(warehouseAreasItemService.getOne(queryWrapper, false));


    }




    /**


@@ -641,7 +644,7 @@


     */


    @Override


    @Transactional(rollbackFor = Exception.class)


    public R publicToStock(PublicToStockParams params, Long loginUserId) {


    public synchronized R publicToStock(PublicToStockParams params, Long loginUserId) {


        if (Objects.isNull(params.getLocCode()) || StringUtils.isBlank(params.getLocCode())) {


            throw new CoolException("库位不能为空！！");


        }


@@ -773,7 +776,7 @@


     */


    @Override


    @Transactional(rollbackFor = Exception.class)


    public R taskGetLocs(String code) throws Exception {


    public synchronized R taskGetLocs(String code) throws Exception {


        if (StringUtils.isBlank(code)) {


            throw new CoolException("拖盘码不能为空！！");


        }


@@ -807,6 +810,9 @@


     */


    @Override


    public R getItemByContainer(Map<String, Object> params) {


        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;


@@ -911,7 +917,7 @@


     * @description 生成任务列表


     */


    @Override


    public R generateTask(Map<String, Object> map, Long loginUserId) {


    public synchronized R generateTask(Map<String, Object> map, Long loginUserId) {


        String barcode = map.get("barcode").toString();


        List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode));


        if (waitPakins.isEmpty()) {


@@ -938,10 +944,15 @@


                    .setFieldsIndex(asnOrderItem.getFieldsIndex())


                    .setBarcode(asnOrderItem.getTrackCode())


                    .setQty(asnOrderItem.getQty())


                    .setStockUnit(asnOrderItem.getStockUnit())


                    .setPurUnit(asnOrderItem.getPurUnit())


                    .setPoCode(asnOrderItem.getPoCode())


                    .setAnfme(asnOrderItem.getAnfme())


                    .setPurQty(asnOrderItem.getPurQty())


                    .setSplrBatch(asnOrderItem.getSplrBatch());


                    .setSplrBatch(asnOrderItem.getSplrBatch())


                    .setMatnr(asnOrderItem.getMatnrCode())


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


            ;




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


            if (Objects.isNull(matnr)) {


@@ -949,19 +960,18 @@


            }


            //SET 物料最大存放数量


            detlsDto.setMaxQty(matnr.getMaxQty())


                    .setMatnrId(matnr.getId())


                    .setStockUnit(matnr.getStockUnit());


            QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()


                    .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));


            if (!Objects.isNull(inspect)) {


                //set 质检结果


                detlsDto.setInspect(inspect.getStatus$());


            }


                    .setMatnrId(matnr.getId());


//            QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()


//                    .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));


//            if (!Objects.isNull(inspect)) {


//                //set 质检结果


//                detlsDto.setInspect(inspect.getStatus$());


//            }


            //获取当前库存信息


            LocItem stockItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()


//                    .eq(LocItem::getOrderItemId, asnOrderItem.getId())


                    .eq(LocItem::getFieldsIndex, asnOrderItem.getFieldsIndex())


                    .eq(LocItem::getBatch, asnOrderItem.getBatch())


                    .eq(LocItem::getBatch, asnOrderItem.getSplrBatch())


                    .eq(LocItem::getMatnrId, asnOrderItem.getMatnrId()));


            //SET 当前库存数量


            if (Objects.isNull(stockItem)) {