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

zss

2026-04-30 c93fc713fedb68cc96f6f29e0442d949b44b7caa

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

@@ -915,4 +915,10 @@
        }
        return new ArrayList<>(mergedPickMap.values());
    }

    @Override
    public int updateOrder(ProductionOrderDto productionOrderDto) {
        productionOrderDto.setStatus(5);
        return baseMapper.updateById(productionOrderDto);
    }
}