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

chenlu

2024-06-07 2f640b1038fa331954f78ed1f4317212cf5bb34d

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

@@ -51,12 +51,14 @@
    @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.seccess();
//        }else {
//            throw new ServiceException(Constants.Code_500,"保存失败");
//
//        }

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

    //删除工单
@@ -67,11 +69,12 @@
            @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.seccess();
//        }else {
//            throw new ServiceException(Constants.Code_500,"删除失败");
//
//        }
        return  Result.seccess(workOrderService.deleteOrderWorkSv(orderId,productionId));
    }
}