Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

8 小时以前 33dbc6a161554f3a897f9e9273feb4f2c1b47381

 north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderFileController.java

@@ -1,8 +1,6 @@
package com.example.erp.controller.sd;

import com.aspose.cad.internal.V.S;
import com.example.erp.common.Result;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.service.sd.OrderFileService;
import io.swagger.annotations.Api;
import lombok.RequiredArgsConstructor;
@@ -21,12 +19,26 @@
    private final OrderFileService orderFileService;

    @PostMapping("/updateOrderFileByOrderNumber/{orderId}/{orderNumber}")
    public Result updateOrderFileByOrderNumber(@RequestParam("file") MultipartFile file, @PathVariable String orderId, @PathVariable String orderNumber) throws IOException {
    public Result updateOrderFileByOrderNumber(
            @RequestParam("file") MultipartFile file,
            @RequestParam("name") String name,
            @PathVariable String orderId,
            @PathVariable String orderNumber) throws IOException {

        return  Result.success(orderFileService.updateOrderFileByOrderNumber(file,orderId,orderNumber));
        return  Result.success(orderFileService.updateOrderFileByOrderNumber(file,name,orderId,orderNumber));
    }
    @PostMapping("/getOrderFilePicture")
    public Result getOrderFilePicture(@RequestBody List<Map<String,Object>> orderDetails) throws NoSuchFieldException {
        return Result.success(orderFileService.getOrderFilePicture(orderDetails));
    }

    @PostMapping("/getOrderNumberFile/{orderId}/{orderNumber}")
    public Result getOrderNumberFile(@PathVariable String orderId,@PathVariable String orderNumber){
        return Result.success(orderFileService.getOrderNumberFile(orderId,orderNumber));
    }
    @PostMapping("/deleteOrderNumberFile/{orderId}/{orderNumber}")
    public Result deleteOrderNumberFile(@PathVariable String orderId,@PathVariable String orderNumber){
        return Result.success(orderFileService.deleteOrderNumberFile(orderId,orderNumber));
    }

}