blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
verou
2025-03-26 2685cbcebfc807cff7b7370458c7db8f4c5b18f5 
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java


@@ -17,6 +17,8 @@


import com.vincent.rsf.server.common.utils.JwtUtil;


import com.vincent.rsf.server.manager.entity.*;


import com.vincent.rsf.server.manager.mapper.*;


import com.vincent.rsf.server.manager.service.AsnOrderItemLogService;


import com.vincent.rsf.server.manager.service.AsnOrderLogService;


import com.vincent.rsf.server.manager.service.WarehouseAreasItemService;


import com.vincent.rsf.server.manager.service.WarehouseAreasService;


import com.vincent.rsf.server.system.constant.CodeRes;


@@ -32,13 +34,16 @@


import com.vincent.rsf.server.system.service.UserLoginService;


import com.vincent.rsf.server.system.utils.SerialRuleUtils;


import org.apache.tika.utils.StringUtils;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.context.annotation.Bean;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import javax.annotation.Resource;


import javax.servlet.http.HttpServletRequest;


import java.math.BigDecimal;


import java.util.*;




/**


@@ -79,6 +84,12 @@


    private PurchaseItemMapper purchaseItemMapper;


    @Resource


    private FieldsMapper fieldsMapper;




    @Autowired


    private AsnOrderLogService asnOrderLogService;




    @Autowired


    private AsnOrderItemLogService asnOrderItemLogService;




    @Autowired


    private FieldsItemService fieldsItemService;


@@ -156,6 +167,7 @@


            throw new CoolException("库区标识不能为空！！");


        }






        WarehouseAreas areasItem = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getId, params.getWhAreaId()));


        if (Objects.isNull(areasItem)) {


            throw new CoolException("数据错误：当前库区不存在！！");


@@ -164,12 +176,46 @@


        List<Fields> fields = fieldsMapper.selectList(new LambdaQueryWrapper<Fields>().eq(Fields::getFlagEnable, 1).eq(Fields::getStatus, 1));




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


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


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




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




        String asnCode = receipts.stream().findFirst().get().getAsnCode();




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


        if (Objects.isNull(asnOrder)) {


            throw new CoolException("数据错误：主单不存在！！");


        }


        asnOrder.setQty(receiptQty);




        if (asnOrderMapper.updateById(asnOrder) < 1) {


            throw new CoolException("已收货数量修改失败！！");


        }




        receipts.forEach(dto -> {


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


            if (Objects.isNull(matnr)) {


                throw new CoolException("数据错误：当前物料不存在！！");


            }


            if (Objects.isNull(dto.getReceiptQty())) {


                throw new CoolException("收货数据不能为空！！");


            }


            if (dto.getReceiptQty() < dto.getPurQty()) {


                throw new CoolException("收货数量不能大于采购数量！！");


            }




            AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>()


                    .eq(AsnOrderItem::getAsnCode, asnCode)


                    .eq(AsnOrderItem::getMatnrId, dto.getMatnrId()));


            if (Objects.isNull(orderItem)) {


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


            }


            orderItem.setQty(dto.getReceiptQty());




            if (asnOrderItemMapper.updateById(orderItem) < 1) {


                throw new CoolException("通知单明细数量修改失败！！");


            }




            WarehouseAreasItem item = new WarehouseAreasItem();


            item.setBarcode(dto.getBarcode())


                    .setAreaName(areasItem.getName())


@@ -204,7 +250,6 @@


                                        .setShiperId(matnr.getShipperId())


                                        .setValue(extendFields.get(key).toString())


                                        .setUuid(uuid16);




                                fieldsItems.add(fieldsItem);


                                //唯一标识入库


                                item.setFieldsIndex(uuid16);


@@ -217,15 +262,62 @@


                }


            }


            allOrders.add(item);




        });




        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("操作成功");


    }




    /**


     * @author Ryan


     * @description 删除原主单及明细，加入历史档


     * @param


     * @return


     * @time 2025/3/19 19:53


     */


    private void operateOrderLogs(AsnOrder asnOrder) {


        if (asnOrderMapper.deleteById(asnOrder.getId()) < 1) {


            throw new CoolException("原单据删除失败！！");


        }




        AsnOrderLog orderLog = new AsnOrderLog();


        BeanUtils.copyProperties(asnOrder, orderLog);




        if (!asnOrderLogService.save(orderLog)) {


            throw new CoolException("主单历史档添加失败！！");


        }




        List<AsnOrderItemLog> logs = new ArrayList<>();


        List<AsnOrderItem> items = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, asnOrder.getId()));


        items.forEach(item -> {


            AsnOrderItemLog itemLog = new AsnOrderItemLog();


            BeanUtils.copyProperties(item, itemLog);


            logs.add(itemLog);


        });




        if (!asnOrderItemLogService.saveBatch(logs)) {


            throw new CoolException("通知单明细历史档保存失败！！");


        }




        if (asnOrderItemMapper.delete(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, asnOrder.getId())) < 1) {


            throw new CoolException("原单据明细删除失败！！");


        }


    }






    /**


     * @author Ryan


@@ -294,7 +386,7 @@


            ReceiptDetlsDto detlsDto = new ReceiptDetlsDto();




            detlsDto.setAsnCode(asnOrderItem.getAsnCode())


                    .setMatnk(asnOrderItem.getMatnk())


                    .setMaktx(asnOrderItem.getMaktx())


                    .setBarcode(asnOrderItem.getBarcode())


                    .setPoCode(asnOrderItem.getPoCode())


                    .setPurQty(asnOrderItem.getAnfme())


@@ -309,7 +401,7 @@


                    .setMatnrId(matnr.getId())


                    .setStockUnit(matnr.getStockUnit());


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


                    .eq(QlyInspect::getAsnItemId, asnOrderItem.getId()).eq(QlyInspect::getPoItemId, asnOrderItem.getPoDetlId()));


                    .eq(QlyInspect::getAsnItemId, asnOrderItem.getId()));


            if (!Objects.isNull(inspect)) {


                //set 质检结果


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


@@ -325,14 +417,17 @@


                detlsDto.setStockQty(stockItem.getQty() + stockItem.getWorkQty());


            }




            //获取采购单明细信息


            PurchaseItem purchaseItem = purchaseItemMapper.selectOne(new LambdaQueryWrapper<PurchaseItem>().eq(PurchaseItem::getId, asnOrderItem.getPoDetlId()));


            //SET 平台行号


            detlsDto.setPlatformId(purchaseItem.getPlatItemId());


            if (!Objects.isNull(asnOrderItem.getPoDetlId())) {


                //获取采购单明细信息


                PurchaseItem purchaseItem = purchaseItemMapper.selectOne(new LambdaQueryWrapper<PurchaseItem>().eq(PurchaseItem::getId, asnOrderItem.getPoDetlId()));


                if (Objects.isNull(purchaseItem)) {


                    //SET 平台行号


                    detlsDto.setPlatformId(purchaseItem.getPlatItemId());


                }


            }




            detlsDtos.add(detlsDto);


        });






        return R.ok(detlsDtos);


    }