blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
skyouc
22 小时以前 ebdfa825c07189b5f8e89f147d96d1bc612589db 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java


@@ -9,7 +9,6 @@


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


@@ -39,7 +38,7 @@


 * @time 2025/3/7 08:02


 */


@Service("asnOrderService")


public class AsnOrderServiceImpl extends ServiceImpl<AsnOrderMapper, AsnOrder> implements AsnOrderService {


public class AsnOrderServiceImpl extends ServiceImpl<AsnOrderMapper, WkOrder> implements AsnOrderService {




    @Autowired


    private ReceiveMsgService receiveMsgService;


@@ -62,11 +61,11 @@


    private PurchaseItemService purchaseItemService;




    @Override


    public boolean notifyInspect(List<AsnOrder> orders) {


    public boolean notifyInspect(List<WkOrder> orders) {


        if (orders.isEmpty()) {


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


        }


        Set<Long> asnIds = orders.stream().map(AsnOrder::getId).collect(Collectors.toSet());


        Set<Long> asnIds = orders.stream().map(WkOrder::getId).collect(Collectors.toSet());


        if (asnIds.isEmpty()) {


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


        }


@@ -82,17 +81,17 @@


    }




    @Override


    public List<AsnOrder> getListByMatnr(Map<String, String> params) {


    public List<WkOrder> getListByMatnr(Map<String, String> params) {


        if (Objects.isNull(params)) {


            throw new CoolException("查询条件不能为空！！");


        }


        List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()


                .like(!Objects.isNull(params.get("maktx")), AsnOrderItem::getMaktx, params.get("maktx"))


                .eq(!Objects.isNull(params.get("matnrCode")), AsnOrderItem::getMatnrCode, params.get("matnrCode")));


        List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()


                .like(!Objects.isNull(params.get("maktx")), WkOrderItem::getMaktx, params.get("maktx"))


                .eq(!Objects.isNull(params.get("matnrCode")), WkOrderItem::getMatnrCode, params.get("matnrCode")));


        if (orderItems.isEmpty()) {


            return new ArrayList<>();


        }


        List<Long> longList = orderItems.stream().map(AsnOrderItem::getAsnId).collect(Collectors.toList());


        List<Long> longList = orderItems.stream().map(WkOrderItem::getAsnId).collect(Collectors.toList());




        return this.listByIds(longList);


    }


@@ -103,7 +102,7 @@


        if (Objects.isNull(params.getOrders())) {


            throw new CoolException("主单信息不能为空");


        }


        AsnOrder orders = params.getOrders();


        WkOrder orders = params.getOrders();


        if (Objects.isNull(orders)) {


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


        }


@@ -137,7 +136,7 @@


    @Override


    @Transactional(rollbackFor = Exception.class)


    public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {


        AsnOrder orders = params.getOrders();


        WkOrder orders = params.getOrders();


        if (Objects.isNull(orders)) {


            throw new CoolException("主单信息不能为空！！");


        }


@@ -165,7 +164,7 @@


     */


    @Transactional(rollbackFor = Exception.class)


    public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {


        AsnOrder orders = params.getOrders();


        WkOrder orders = params.getOrders();


        params.getItems().forEach(item -> {


            item.put("asnId", orders.getId());


            item.put("asnCode", orders.getCode());


@@ -176,9 +175,9 @@


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


            }


        });


        List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()


                .eq(AsnOrderItem::getAsnId, params.getOrders().getId()));


        double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();


        List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()


                .eq(WkOrderItem::getAsnId, params.getOrders().getId()));


        double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();


        orders.setAnfme(sum);


        if (!this.updateById(orders)) {


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


@@ -194,18 +193,18 @@


     */


    @Override


    public boolean batchUpdate(BatchUpdateParam params, Long userId) {


        AsnOrder order = params.getOrder();


        WkOrder order = params.getOrder();


        if (Objects.isNull(order)) {


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


        }


        return this.update(new LambdaUpdateWrapper<AsnOrder>()


                .in(AsnOrder::getId, params.getIds())


                .set(!Objects.isNull(order.getRleStatus()), AsnOrder::getRleStatus, order.getRleStatus())


                .set(!Objects.isNull(order.getNtyStatus()), AsnOrder::getNtyStatus, order.getNtyStatus())


                .set(!Objects.isNull(order.getStatus()), AsnOrder::getStatus, order.getStatus())


                .set(!Objects.isNull(order.getWkType()), AsnOrder::getWkType, order.getWkType())


                .set(!Objects.isNull(order.getExceStatus()), AsnOrder::getExceStatus, order.getExceStatus())


                .set(AsnOrder::getUpdateBy, userId));


        return this.update(new LambdaUpdateWrapper<WkOrder>()


                .in(WkOrder::getId, params.getIds())


                .set(!Objects.isNull(order.getRleStatus()), WkOrder::getRleStatus, order.getRleStatus())


                .set(!Objects.isNull(order.getNtyStatus()), WkOrder::getNtyStatus, order.getNtyStatus())


                .set(!Objects.isNull(order.getStatus()), WkOrder::getStatus, order.getStatus())


                .set(!Objects.isNull(order.getWkType()), WkOrder::getWkType, order.getWkType())


                .set(!Objects.isNull(order.getExceStatus()), WkOrder::getExceStatus, order.getExceStatus())


                .set(WkOrder::getUpdateBy, userId));


    }




    /**


@@ -219,13 +218,13 @@


    @Override


    @Transactional(rollbackFor = Exception.class)


    public R completeOrder(Long id, Long loginUserId) {


        AsnOrder asnOrder = this.getById(id);


        if (Objects.isNull(asnOrder)) {


        WkOrder wkOrder = this.getById(id);


        if (Objects.isNull(wkOrder)) {


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


        }


        //一键加入历史档


        try {


            operateOrderLogs(asnOrder);


            operateOrderLogs(wkOrder);


        } catch (Exception e) {


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


        }


@@ -235,7 +234,7 @@


    @Override


    @Transactional(rollbackFor = Exception.class)


    public R closeOrder(Long id) {


        AsnOrder order = this.getById(id);


        WkOrder order = this.getById(id);


        if (Objects.isNull(order)) {


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


        }


@@ -265,7 +264,7 @@


        if (Objects.isNull(purchase)) {


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


        }


        AsnOrder order = new AsnOrder();


        WkOrder order = new WkOrder();


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


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


        order.setCode(code)


@@ -277,9 +276,9 @@


        if (!this.save(order)) {


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


        }


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


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


        for (PurchaseItem item : itemList) {


            AsnOrderItem orderItem = new AsnOrderItem();


            WkOrderItem orderItem = new WkOrderItem();


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


            if (Objects.isNull(matnr)) {


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


@@ -290,7 +289,7 @@


            }




            PurchaseItem service = purchaseItemService.getById(item.getId());


            Double qty = service.getQty() + item.getAnfme();


            Double qty = Math.round((service.getQty() + item.getAnfme()) * 10000) / 10000.0;


            if (qty.compareTo(service.getAnfme()) > 0) {


                throw new CoolException("新建单据数量不能大于计划数量！！");


            }


@@ -316,19 +315,22 @@


            if (Objects.isNull(purchaseItem)) {


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


            }


            purchaseItem.setQty(purchaseItem.getQty() +  item.getAnfme());




            Double toQty = Math.round((purchaseItem.getQty() + item.getAnfme()) * 10000) / 10000.0;


            purchaseItem.setQty(toQty);


            if (!purchaseItemService.updateById(purchaseItem)) {


                throw new CoolException("PO单明细修改失败！！");


            }


        }




        double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();


        double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();




        if (!asnOrderItemService.saveBatch(orderItems)) {


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


        }


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


        purchase.setQty(sum + purchase.getQty())


        Double qty = Math.round((sum + purchase.getQty()) * 10000) / 10000.0;


        purchase.setQty(qty)


                .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);




        if (!purchaseService.saveOrUpdate(purchase)) {


@@ -352,8 +354,8 @@


    @Transactional(rollbackFor = Exception.class)


    public R removeOrders(List<Long> ids) {


        for (Long id : ids) {


            List<AsnOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()


                    .eq(AsnOrderItem::getAsnId, id));


            List<WkOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()


                    .eq(WkOrderItem::getAsnId, id));


            if (list.isEmpty()) {


                continue;


            }


@@ -361,34 +363,38 @@


            list.forEach(item -> {


                PurchaseItem purchaseItem = purchaseItemService.getById(item.getPoDetlId());


                if (!Objects.isNull(purchaseItem)) {


                    purchaseItem.setQty(purchaseItem.getQty() - item.getAnfme());


                }


                if (!purchaseItemService.updateById(purchaseItem)) {


                    throw new CoolException("PO单明细更新失败！！");


                    Double minusQty = Math.round((purchaseItem.getQty() - item.getAnfme()) * 10000) / 10000.0;


                    purchaseItem.setQty(minusQty);


                    if (!purchaseItemService.updateById(purchaseItem)) {


                        throw new CoolException("PO单明细更新失败！！");


                    }


                }


            });




            double sum = list.stream().mapToDouble(AsnOrderItem::getAnfme).sum();


            double sum = list.stream().mapToDouble(WkOrderItem::getAnfme).sum();




            Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>()


                    .eq(Purchase::getCode, list.stream().findFirst().get().getPoCode()));


            purchase.setQty(purchase.getQty() - sum)


                    .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);


            if (!Objects.isNull(purchase)) {


                Double qty = Math.round((purchase.getQty() - sum) * 10000) / 10000.0;


                purchase.setQty(qty)


                        .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);




            if (!purchaseService.updateById(purchase)) {


                throw new CoolException("PO单据更新失败！！");


                if (!purchaseService.updateById(purchase)) {


                    throw new CoolException("PO单据更新失败！！");


                }


            }


        }




        if (!this.remove(new LambdaQueryWrapper<AsnOrder>()


                .in(AsnOrder::getId, ids)


                .eq(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val))) {


        if (!this.remove(new LambdaQueryWrapper<WkOrder>()


                .in(WkOrder::getId, ids)


                .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val))) {


            throw new CoolException("任务中单据不可删除！！");


        }






        if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>()


                .in(AsnOrderItem::getAsnId, ids))) {


        if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()


                .in(WkOrderItem::getAsnId, ids))) {


//            throw new CoolException("Details Delete Fail");


        }




@@ -403,7 +409,7 @@


     * @time 2025/3/19 19:53


     */


    @Transactional(rollbackFor = Exception.class)


    public synchronized void operateOrderLogs(AsnOrder asrder) throws Exception {


    public synchronized void operateOrderLogs(WkOrder asrder) throws Exception {


        if (Objects.isNull(asrder) || Objects.isNull(asrder.getId())) {


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


        }


@@ -412,14 +418,14 @@


        if (!this.updateById(asrder)) {


            throw new CoolException("单据关闭失败！！");


        }


        List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, asrder.getId()));


        List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, asrder.getId()));


        if (orderItems.isEmpty()) {


            throw new CoolException("收货明细为空！！");


        }


//        if (Objects.isNull(asrder.getAnfme()) || asrder.getAnfme().compareTo(0.00) == 0) {


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


//        }


        AsnOrder order = this.getById(asrder.getId());


        WkOrder order = this.getById(asrder.getId());


        AsnOrderLog orderLog = new AsnOrderLog();


//        order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);


        BeanUtils.copyProperties(order, orderLog);


@@ -434,7 +440,7 @@


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


        }


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


        List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));


        List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, order.getId()));


        items.forEach(item -> {


            AsnOrderItemLog itemLog = new AsnOrderItemLog();


            BeanUtils.copyProperties(item, itemLog);


@@ -447,7 +453,7 @@


        if (!asnOrderItemLogService.saveBatch(logs)) {


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


        }


        if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()))) {


        if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, order.getId()))) {


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


        }


        if (!this.removeById(asrder.getId())) {