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

云

8 天以前 2f80b7085c4eabce06d3491306b75eecc275275f

 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);
    }
}