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

liyong

2 天以前 7193fdcb256c3836393bff9c3ab0efe4fa56a3c0

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

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