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

buhuazhen

8 天以前 a02b448c103d747f814c133d030df3c8958371fd

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

@@ -855,12 +855,10 @@
                if (reportOutput == null) {
                    continue;
                }
                Long reportMainId = reportOutput.getProductionProductMainId() != null
                        ? reportOutput.getProductionProductMainId()
                        : reportOutput.getProductMainId();
                if (reportMainId == null) {
                if (reportOutput.getProductionProductMainId() == null) {
                    continue;
                }
                Long reportMainId = reportOutput.getProductionProductMainId();
                reportOutputMap.computeIfAbsent(reportMainId, k -> new ArrayList<>()).add(reportOutput);
            }