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

zss

20 小时以前 6ed4b397bb9dbb9c2d7bb0676339721fa97996bf

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

@@ -227,7 +227,7 @@
                    .salesLedgerWorkId(productionProductMain.getId())
                    .salesLedgerSchedulingId(0L)
                    .salesLedgerId(productOrder.getSalesLedgerId())
                    .salesLedgerProductId(productOrder.getProductModelId())
                    .salesLedgerProductId(productOrder.getSaleLedgerProductId())
                    .schedulingUserId(user.getUserId())
                    .schedulingUserName(user.getNickName())
                    .finishedNum(productQty)