Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_山西长治

yuan

2026-07-13 bb078cde6d9641ec84ee3c52b544153845795c0e

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

@@ -1134,7 +1134,7 @@
    @Override
    public int updateOrder(ProductionOrderDto productionOrderDto) {
        // 更新生产订单主数据
        productionOrderDto.setStatus(5);
        productionOrderDto.setStatus(ProductOrderStatusEnum.END.getCode());
        return baseMapper.updateById(productionOrderDto);
    }
}