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

chenlu

2024-03-01 37931d04e87cbae60cf833890c2c8432b389fa1a

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

@@ -39,10 +39,10 @@
    }



    //添加工单
    @PostMapping("/addOrderWork")
    public Result AddOrderWork( @RequestBody Map<String,Object>  object){
        System.out.println("obj:"+object);

        if(workOrderService.AddOrderWorkSv(object)){
            return Result.seccess();
        }else {
@@ -51,6 +51,7 @@
        }
    }

    //删除工单
    @PostMapping("/deleteOrderWork/{orderId}/{productName}")
    public Result deleteOrderWork(
            @PathVariable String orderId,