Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-09-24 edc227277159601c5cb86829f1c5ce14cf7903a4

 north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java

@@ -57,10 +57,15 @@
        String orderId = orderDetaillist.get(0).getOrderId();

        for (OrderDetail orderDetail : orderDetaillist) {
            if(orderDetail.getOrderId()!= orderId){
                orderId = orderDetail.getOrderId();
                letters = '1';
                lettr = 'A';
            }
            //生成生产订单号
            for (int i = 0; i < count; i++) {
                letters = lettr++;
                productIdVl = orderId + letters;
                productIdVl = orderDetail.getOrderId() + letters;
                //查询生成的生产订单号是否存在
                Integer workCount = workOrderMapper.selectOrderNumber(productIdVl);
                if (workCount < 1) {