标准版WMS
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zjj
6 天以前 d8dd683271bffd641084193c6d8ef0b2cffa008d 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java


@@ -8,19 +8,14 @@


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


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


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


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


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


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


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


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


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


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


import com.vincent.rsf.server.manager.enums.AsnExceStatus;


import com.vincent.rsf.server.manager.enums.POExceStatus;


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


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


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


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


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


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


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


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


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


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


import com.vincent.rsf.server.system.mapper.SerialRuleMapper;


@@ -49,8 +44,7 @@


    private ReceiveMsgService receiveMsgService;


    @Autowired


    private ReportMsgService reportMsgService;


    @Resource


    private PurchaseMapper purchaseMapper;




    @Autowired


    private AsnOrderItemService asnOrderItemService;


    @Autowired


@@ -59,6 +53,12 @@


    private AsnOrderItemLogService asnOrderItemLogService;


    @Resource


    private SerialRuleMapper serialRuleMapper;


    @Autowired


    private MatnrService matnrService;


    @Autowired


    private PurchaseService purchaseService;


    @Autowired


    private PurchaseItemService purchaseItemService;




    @Override


    public boolean notifyInspect(List<AsnOrder> orders) {


@@ -69,7 +69,7 @@


        if (asnIds.isEmpty()) {


            throw new CoolException("ASN单据不能为空！！");


        }


        List<PoItemsDto> items = purchaseMapper.poList(asnIds);


        List<PoItemsDto> items = purchaseService.poList(asnIds);


        if (items.isEmpty()) {


            throw new CoolException("物料所属采购单据不存在！！");


        }


@@ -247,6 +247,87 @@


    }




    /**


     * @author Ryan


     * @date 2025/5/13


     * @description: 根据PO单创建ASN单


     * @version 1.0


     */


    @Override


    public R createByPo(List<Long> ids) {


        //获取未生成ASN单据


        List<Purchase> purchases = purchaseService.list(new LambdaQueryWrapper<Purchase>().in(Purchase::getId, ids));


        //生成ASN单据


        purchases.forEach(purchase -> {


            if (!Objects.isNull(purchase.getStartTime())) {


                //判断起始时间是否大于当前时间


                if (DateUtils.compareDate(new Date(), purchase.getStartTime())) {


                    return;


                }


            }


            List<PurchaseItem> items = purchaseItemService.list(new LambdaQueryWrapper<PurchaseItem>().eq(PurchaseItem::getPurchaseId, purchase.getId()));


            if (items.isEmpty()) {


                throw new CoolException("子列表数据为空，请查询PO单是否正确录入！！");


            }


            AsnOrder order = new AsnOrder();


            //根据编码规则生成ASN单号


            String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, purchase);


            order.setAnfme(purchase.getAnfme())


                    .setCode(code)


                    .setArrTime(purchase.getPreArr())


                    .setQty(purchase.getQty())


                    .setPoId(purchase.getId())


                    .setPoCode(purchase.getCode());


            if (!this.save(order)) {


                throw new CoolException("ASN单据保存失败！！");


            }


            List<AsnOrderItem> orderItems = new ArrayList<>();


            items.forEach(item -> {


                AsnOrderItem orderItem = new AsnOrderItem();


                Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode()));


                if (Objects.isNull(matnr)) {


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


                }


                String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);


                if (StringUtils.isBlank(trackCode)) {


                    throw new CoolException("单据跟踪码生成失败：请检查「sys_asn_mantr_label」是否配置完成！！");


                }


//                String barcode = code + matnr.getCode();


                orderItem.setAnfme(item.getAnfme())


                        .setAsnId(order.getId())


                        .setQty(item.getAnfme())


                        .setSplrName(item.getSplrName())


                        .setAsnCode(code)


                        .setSplrBatch(item.getSplrBatch())


                        .setSplrCode(item.getSplrCode())


                        .setPoDetlId(item.getId())


                        .setPlatItemId(item.getPlatItemId())


                        .setTrackCode(trackCode)


                        .setPoCode(purchase.getCode())


                        .setPurQty(item.getAnfme())


                        .setPurUnit(item.getUnit())


                        .setMatnrCode(matnr.getCode())


                        .setMaktx(matnr.getName())


                        .setMatnrId(matnr.getId());


                orderItems.add(orderItem);


            });


            if (!asnOrderItemService.saveBatch(orderItems)) {


                throw new CoolException(("Asn单据明细保存失败！！"));


            }




            //任务执行完成，修改已完成数量和PO单执行状态


            purchase.setQty(purchase.getAnfme())


                    .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);




            if (!purchaseService.saveOrUpdate(purchase)) {


                throw new CoolException("PO单执行完成后，保存失败！！");


            }


        });






        return null;


    }




    /**


     * @param


     * @return


     * @author Ryan