Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

guoyuji

2024-04-26 684399b665ef8c25c43faff0fdc821a0b72b39ba

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

@@ -2,7 +2,9 @@

import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.pp.DamageDetails;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.ReportService;
@@ -33,4 +35,14 @@
        return Result.seccess(reportService.processCardProgressSv(orderId,columns));
    }

    @ApiOperation("跨工序次破")
    @PostMapping("/crossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
    public Result getOrderReport(@PathVariable Integer pageNum,
                                 @PathVariable Integer pageSize,
                                 @PathVariable List<String> selectDate,
                                 @RequestBody DamageDetails damageDetails)  {
        return  Result.seccess(reportService.crossProcessBreakingSv(pageNum,pageSize,selectDate,damageDetails));

    }

}