feat(productOrder): 修复自动生成订单编号序号

buhuazhen

2026-04-27 f25369ff160772b7e866462cb10dda799d27e9fb

 src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java

@@ -83,8 +83,6 @@
                    productionPrintOrder.convertProductOrderDto(record);
                }
            });


        }

        return productOrderDtoIPage;
@@ -126,7 +124,7 @@
                productWorkOrder.setProductOrderId(productOrder.getId());
                ProductOrder order = productOrderMapper.selectById(productOrder.getId());
                productWorkOrder.setPlanQuantity(order.getQuantity());
                productWorkOrder.setWorkOrderNo(productWorkOrderService.generateProductWorkOrder(null, productProcessMap.getOrDefault(productProcessRouteItem.getProcessId(), new ProductProcess()).getName(), productOrder.getNpsNo()));
                productWorkOrder.setWorkOrderNo(productWorkOrderService.generateProductWorkOrder( productProcessMap.getOrDefault(productProcessRouteItem.getProcessId(), new ProductProcess()).getName(), productOrder.getNpsNo()));
                productWorkOrder.setStatus(1);
                productWorkOrderMapper.insert(productWorkOrder);
            }
@@ -215,8 +213,8 @@
        return "SC" + datePrefix + formatOrderSequence(datePrefix);
    }

    public String generateNextOrderByContractNo(String datePrefix, String contractNo) {
        return contractNo + formatOrderSequence(datePrefix);
    public String generateNextOrderByContractNo(String contractNo) {
        return contractNo + formatOrderSequenceByContractNo(contractNo);
    }

    private String formatOrderSequence(String datePrefix) {
@@ -235,4 +233,12 @@
        return String.format("%04d", sequence);
    }


    private String formatOrderSequenceByContractNo(String contractNo) {
        LambdaQueryWrapper<ProductOrder> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.likeRight(ProductOrder::getNpsNo, contractNo);
        Long count = productOrderMapper.selectCount(queryWrapper);
        return String.format("%04d", count+1);
    }

}