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

云

2026-04-28 56b8b84689ccf5389ee02814bcb8bfe407f05a87

 src/main/java/com/ruoyi/production/controller/ProductionOrderRoutingOperationParamController.java

@@ -4,12 +4,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.bean.dto.ProductionOrderRoutingOperationParamDto;
import com.ruoyi.production.bean.dto.ProductionOrderRoutingOperationParamSyncDto;
import com.ruoyi.production.bean.vo.ProductionOrderRoutingOperationParamVo;
import com.ruoyi.production.pojo.ProductionOrderRoutingOperationParam;
import com.ruoyi.production.service.ProductionOrderRoutingOperationParamService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -51,7 +50,7 @@
    @PutMapping
    @Operation(summary = "修改生产订单工艺路线工序参数")
    public R<Boolean> edit(@RequestBody ProductionOrderRoutingOperationParam item) {
        return R.ok(productionOrderRoutingOperationParamService.saveProductionOrderRoutingOperationParam(item));
        return R.ok(productionOrderRoutingOperationParamService.updateById(item));
    }

    @DeleteMapping("/{id}")
@@ -60,9 +59,4 @@
        return R.ok(productionOrderRoutingOperationParamService.removeProductionOrderRoutingOperationParam(id));
    }

    @PostMapping("/sync")
    @Operation(summary = "按订单工艺路线工序同步工序参数")
    public R<Integer> sync(@RequestBody ProductionOrderRoutingOperationParamSyncDto syncDto) {
        return R.ok(productionOrderRoutingOperationParamService.syncProductionOrderRoutingOperationParam(syncDto));
    }
}