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

廖井涛

2024-03-07 f60327c377097f67ed42c349bda2a54c3147b7be

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

@@ -20,7 +20,7 @@

    //查询工单
    @PostMapping  ("/orderGlassDetail/{selectTime1}/{selectTime2}/{state}")
    public Result DateWork(
    public Result dateWork(
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @PathVariable Integer state,
@@ -31,19 +31,19 @@
    //转生产订单查询
    @PostMapping  ("/addWork/{orderId}")

    public Result AddWork(
    public Result addWork(
            @PathVariable String orderId,
            @RequestBody OrderDetail orderDetail){
        return Result.seccess(workOrderService.AddDateWork(orderId,orderDetail));
        return Result.seccess(workOrderService.addDateWork(orderId,orderDetail));

    }


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

        if(workOrderService.addOrderWorkSv(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");
@@ -57,7 +57,7 @@
            @PathVariable String orderId,
            @PathVariable String productName
    ){
        if(workOrderService.DeleteOrderWorkSv(orderId,productName)){
        if(workOrderService.deleteOrderWorkSv(orderId,productName)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"删除失败");