blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
skyouc
2025-04-01 d346400e27af0205539dd61f72dd2cdf40d44ab9 
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java


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


import com.vincent.rsf.framework.exception.CoolException;


import com.vincent.rsf.server.api.controller.params.OtherReceiptParams;


import com.vincent.rsf.server.api.controller.params.ReceiptParams;


import com.vincent.rsf.server.api.entity.dto.InspectDetlDto;


import com.vincent.rsf.server.api.entity.dto.InspectItemDto;


import com.vincent.rsf.server.api.entity.dto.ReceiptDetlsDto;


import com.vincent.rsf.server.api.entity.enums.OrderWorkType;


import com.vincent.rsf.server.api.service.MobileService;


@@ -14,12 +16,10 @@


import com.vincent.rsf.server.common.security.JwtSubject;


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


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


import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;


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.manager.service.*;


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


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


import com.vincent.rsf.server.system.controller.param.LoginParam;


@@ -43,6 +43,7 @@


import javax.annotation.Resource;


import javax.servlet.http.HttpServletRequest;


import java.math.BigDecimal;


import java.text.SimpleDateFormat;


import java.util.*;




/**


@@ -83,9 +84,17 @@


    private PurchaseItemMapper purchaseItemMapper;


    @Resource


    private FieldsMapper fieldsMapper;


    @Autowired


    private IsptHistoriesMapper isptHistoriesMapper;




    @Autowired


    private AsnOrderLogService asnOrderLogService;




    @Autowired


    private WaitPakinService waitPakinService;




    @Autowired


    private WaitPakinItemService waitPakinItemService;




    @Autowired


    private AsnOrderItemLogService asnOrderItemLogService;


@@ -166,12 +175,15 @@


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


        }




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


        WarehouseAreas areasItem = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()


                .eq(WarehouseAreas::getId, params.getWhAreaId()));


        if (Objects.isNull(areasItem)) {


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


        }


        //获取已启用的动态扩展字


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


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


@@ -180,7 +192,8 @@




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




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


        AsnOrder asnOrder = asnOrderMapper.selectOne(new LambdaQueryWrapper<AsnOrder>()


                .eq(AsnOrder::getCode, asnCode));


        if (Objects.isNull(asnOrder)) {


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


        }


@@ -208,16 +221,27 @@


            if (Objects.isNull(orderItem)) {


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


            }


            orderItem.setQty(dto.getReceiptQty());


            if (Objects.isNull(dto.getReceiptQty()) || Double.compare(dto.getReceiptQty(), 0.0) == 0) {


                throw new CoolException("收货数量不能为零！！");


            }


            orderItem.setQty(dto.getReceiptQty())


                    .setProdTime(dto.getProdTime());




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


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


            }




            WarehouseAreasItem item = new WarehouseAreasItem();


//            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");


//            String format = null;


//            if (Objects.isNull(dto.getProdTime())) {


//                 format = dateFormat.format(dto.getProdTime());


//            }


            item.setBarcode(dto.getBarcode())


                    .setAreaName(areasItem.getName())


                    .setAreaId(areasItem.getId())


                    .setProdTime(dto.getProdTime())


                    .setWeight(dto.getWeigth())


                    .setStockUnit(dto.getStockUnit())


                    .setBatch(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto))


                    .setAnfme(dto.getReceiptQty())


@@ -378,6 +402,69 @@


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


    }




    @Override


    public R getDeltByCode(String code) {


        return R.ok(asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getTrackCode, code)));


    }




    /**


     * @author Ryan


     * @description PDA组拖


     * @param


     * @return


     * @time 2025/3/29 14:26


     */


    @Override


    public WaitPakin mergeItems(WaitPakinParam waitPakin) {


        return waitPakinService.mergeItems(waitPakin);


    }




    @Override


    public WaitPakin unBind(WaitPakinParam param) {


        return waitPakinService.unBind(param);


    }




    /**


     * 报检功能


     * @param code


     * @param loginUserId


     * @return


     */


    @Override


    public R inspect(String code, Long loginUserId) {


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


        if (Objects.isNull(asnOrders)) {


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


        }


        InspectDetlDto detlDto = new InspectDetlDto();


        detlDto.setCode(asnOrders.getCode()).setPoCode(asnOrders.getPoCode());


        List<AsnOrderItem> orderItems = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnCode, code));


        if (orderItems.isEmpty()) {


            detlDto.setItems(new ArrayList<>());


        } else {


            List<InspectItemDto> itemDtos = new ArrayList<>();


            orderItems.forEach(dto -> {


                InspectItemDto itemDto = new InspectItemDto();


                if (!Objects.isNull(dto.getMatnrCode())) {


                    Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, dto.getMatnrCode()));


                    itemDto.setGroup(matnr.getGroupCode());


                }


                itemDto.setMaktx(dto.getMaktx())


                        .setMatnrCode(dto.getMatnrCode())


                        .setPurUnit(dto.getPurUnit())


                        .setSuplierCode(dto.getSplrCode())


                        .setSuplierName(dto.getSplrName())


                        .setPurQty(dto.getPurQty());


                itemDtos.add(itemDto);


            });


            detlDto.setItems(itemDtos);


        }




        List<IsptHistories> histories = isptHistoriesMapper.selectList(new LambdaQueryWrapper<IsptHistories>().eq(IsptHistories::getAsnId, asnOrders.getId()));


        detlDto.setHistories(histories);


        return R.ok(detlDto);


    }




    /**


     * 获取ReceiptDetlsDtos


     */


@@ -388,7 +475,8 @@




            detlsDto.setAsnCode(asnOrderItem.getAsnCode())


                    .setMaktx(asnOrderItem.getMaktx())


                    .setBarcode(asnOrderItem.getBarcode())


                    .setBarcode(asnOrderItem.getTrackCode())


                    .setQty(asnOrderItem.getQty())


                    .setPoCode(asnOrderItem.getPoCode())


                    .setAnfme(asnOrderItem.getAnfme())


                    .setPurQty(asnOrderItem.getPurQty())


@@ -403,7 +491,7 @@


                    .setMatnrId(matnr.getId())


                    .setStockUnit(matnr.getStockUnit());


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


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


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


            if (!Objects.isNull(inspect)) {


                //set 质检结果


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