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

gongchunyi

15 小时以前 ed4dd489b756c220455e407786654558f53f115d

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

@@ -91,7 +91,7 @@
                ProductWorkOrder productWorkOrder = new ProductWorkOrder();
                productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
                productWorkOrder.setProductOrderId(productOrder.getId());
                ProductOrder order = productOrderMapper.selectById(productOrder);
                ProductOrder order = productOrderMapper.selectById(productOrder.getId());
                productWorkOrder.setPlanQuantity(order.getQuantity());
                productWorkOrder.setWorkOrderNo(workOrderNoStr);
                productWorkOrder.setStatus(1);