mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 05:42:06 +08:00
Merge remote-tracking branch 'origin/main'
This commit is contained in:
+1
-1
@@ -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));
|
||||
|
||||
+1
-1
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user