Merge remote-tracking branch 'origin/main'

This commit is contained in:
liuzhaotian
2024-06-19 17:35:35 +08:00
26 changed files with 612 additions and 96 deletions
@@ -102,7 +102,7 @@ public class RemainPlateController {
@GetMapping("/page")
@Operation(summary = "获得生产单余料板表分页")
@PreAuthorize("@ss.hasPermission('manage:remain-plate:query')")
@PreAuthorize("@ss.hasPermission('placeorder:remain')")
public CommonResult<PageResult<RemainPlateRespVO>> getRemainPlatePage(@Valid RemainPlatePageReqVO pageReqVO) {
PageResult<RemainPlateDO> pageResult = remainPlateService.getRemainPlatePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, RemainPlateRespVO.class));
@@ -65,7 +65,7 @@ public class ProductionStatusController {
@GetMapping("/select")
@Operation(summary = "查看生产单下的工序组工序")
@Parameter(name = "orderNo", description = "生产单Id", required = true)
@PreAuthorize("@ss.hasPermission('manage:query:select')")
@PreAuthorize("@ss.hasPermission('production:manager-list:processStatus')")
public CommonResult<List<ProductionGroupVO>> selectProduction(@Valid @RequestParam("orderNo") Long orderNo){
List<ProductionGroupVO> orderProcessById = productionStatusService.selectProduction(orderNo);