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

guoyujie

6 天以前 1750abd11320f8d09ffe1580b7467dba87c86c89

 north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java

@@ -13,6 +13,7 @@
import org.springframework.web.bind.annotation.*;

import java.sql.Date;
import java.util.List;
import java.util.Map;

@RestController
@@ -24,14 +25,13 @@

    //查询工单
    @ApiOperation("查询工单接口")
    @SaCheckPermission("SelectWorkOrder.search")
    @PostMapping  ("/orderGlassDetail/{selectTime1}/{selectTime2}/{state}")
    @SaCheckPermission("selectWorkOrder.search")
    @PostMapping  ("/orderGlassDetail/{selectDate}/{state}")
    public Result dateWork(
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @PathVariable List<String> selectDate,
            @PathVariable Integer state,
            @RequestBody OrderGlassDetail orderGlassDetail){
        return Result.seccess(workOrderService.defaultDateWork(selectTime1,selectTime2,state,orderGlassDetail));
        return Result.success(workOrderService.defaultDateWork(selectDate,state,orderGlassDetail));
    }

    //转生产订单查询
@@ -40,7 +40,7 @@
    public Result addWork(
            @PathVariable String orderId,
            @RequestBody OrderDetail orderDetail){
        return Result.seccess(workOrderService.addDateWork(orderId,orderDetail));
        return Result.success(workOrderService.addDateWork(orderId,orderDetail));

    }

@@ -51,27 +51,30 @@
    @PostMapping("/addOrderWork")
    public Result addOrderWork( @RequestBody Map<String,Object>  object){

        if(workOrderService.addOrderWorkSv(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");
//        if(workOrderService.addOrderWorkSv(object)){
//            return Result.success();
//        }else {
//            throw new ServiceException(Constants.Code_500,"保存失败");
//
//        }

        }
        return  Result.success(workOrderService.addOrderWorkSv(object));
    }

    //删除工单
    @ApiOperation("删除工单接口")
    @SaCheckPermission("SelectWorkOrder.delete")
    @SaCheckPermission("selectWorkOrder.delete")
    @PostMapping("/deleteOrderWork/{orderId}/{productionId}")
    public Result deleteOrderWork(
            @PathVariable String orderId,
            @PathVariable String productionId
    ){
        if(workOrderService.deleteOrderWorkSv(orderId,productionId)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"删除失败");

        }
//        if(workOrderService.deleteOrderWorkSv(orderId,productionId)){
//            return Result.success();
//        }else {
//            throw new ServiceException(Constants.Code_500,"删除失败");
//
//        }
        return  Result.success(workOrderService.deleteOrderWorkSv(orderId,productionId));
    }
}