Merge remote-tracking branch 'origin/dev_New' into dev_New

zss

3 天以前 3effe2402062b93d9ea0ea3fed340156f2be937b

 src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java

@@ -116,7 +116,7 @@
                                    }
                                }
                                // 生成完整的工单号
                                String workOrderNoStr = String.format("%s%03d", datePrefix, sequenceNumber);
                                String workOrderNoStr ="FG" +String.format("%s%03d", datePrefix, sequenceNumber);
                                ProductWorkOrder productWorkOrder = new ProductWorkOrder();
                                productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
                                productWorkOrder.setProductOrderId(order.getId());