Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

基础配置权限修改，禅道-模糊，工序Bug修改

Browse Source
This commit is contained in:
liuzhaotian
2024-06-26 14:56:15 +08:00
parent 5b9ead86d1
commit 8e5d71bf4b
14 changed files with 112 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java
+7 -5
View File
@@ -63,6 +63,7 @@ public class PackController {
@GetMapping("/getOrderPlate")
@Operation(summary = "查看生产订单对应的板材信息")
@Parameter(name = "orderId", description = "生产单Id", required = true)
@PreAuthorize("@ss.hasPermission('manage:pack-palte:query')")
public CommonResult<List<PlateDetailsRespVO>> getOrderPlateList(@Valid @RequestParam("orderId") Long orderId) {
return success(packService.getOrderPlateList(orderId));
@@ -72,6 +73,7 @@ public class PackController {
@GetMapping("/getOrderPlateList")
@Operation(summary = "查询多个生产单对应的板材信息")
@PreAuthorize("@ss.hasPermission('manage:pack-palte:query')")
public CommonResult<List<PlateDetailsRespVO>> getOrdersPlateList(@Valid @RequestParam List<Long> orderIds) {
return success(packService.getOrdersPlateList(orderIds));
@@ -121,7 +123,7 @@ public class PackController {
@GetMapping("/getParts")
@Operation(summary = "查看配件列表分页")
@PreAuthorize("@ss.hasPermission('manage:pack:query')")
@PreAuthorize("@ss.hasPermission('manage:pack-parts:query')")
public CommonResult<PageResult<OrderPartsRespVO>> getParts(@Valid OrderPartsReqVO reqVO) {
return success(packService.getPartsList(reqVO));
@@ -136,7 +138,7 @@ public class PackController {
@PutMapping("/updatePack")
@Operation(summary = "板材包裹更新-即封包")
@PreAuthorize("@ss.hasPermission('manage:pack:updatePack')")
@PreAuthorize("@ss.hasPermission('manage:pack:update')")
public CommonResult<OrderPackRespVO> updatePack(@Valid @RequestBody OrderPackReqVO packageVO) {
return success(packService.updatePack(packageVO));
@@ -148,7 +150,7 @@ public class PackController {
@PutMapping("/updateParts")
@Operation(summary = "配件包裹更新-即封包")
@PreAuthorize("@ss.hasPermission('manage:pack:updateParts')")
@PreAuthorize("@ss.hasPermission('manage:pack:update')")
public CommonResult<OrderPackRespVO> updateParts(@Valid @RequestBody OrderPartsReqVO reqVO) {
return success(packService.updateParts(reqVO));
@@ -162,7 +164,7 @@ public class PackController {
@GetMapping("/selectPack")
@Operation(summary = "查询包裹")
@Parameter(name = "orderId", description = "生产单Id", required = true)
@PreAuthorize("@ss.hasPermission('manage:pack:update')")
@PreAuthorize("@ss.hasPermission('manage:pack:query')")
public CommonResult<List<OrderPackRespVO>> selectPack(@Valid @RequestParam("orderId") Long orderId) {
return success(packService.selectPack(orderId));
@@ -186,7 +188,7 @@ public class PackController {
@PutMapping("/unpacking")
@Operation(summary = "拆包-更改包裹为未封包")
@PreAuthorize("@ss.hasPermission('manage:pack:unpacking')")
@PreAuthorize("@ss.hasPermission('manage:pack:update')")
public CommonResult<OrderPackRespVO> unpacking(@Valid @RequestBody PackingReqVO reqVO) {
OrderPackRespVO unpacking = packService.unpacking(reqVO.getPackageId());
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java
+16 -8
View File
@@ -44,14 +44,16 @@ public class PlateController {
@PostMapping("/create")
@Operation(summary = "创建板材信息表 plate_{N}")
@PreAuthorize("@ss.hasPermission('manage:plate:create')")
// @PreAuthorize("@ss.hasPermission('manage:plate:create')")
@PreAuthorize("@ss.hasAnyPermissions('manage:plate:create','base:plate:create')")
public CommonResult<Long> createPlate(@Valid @RequestBody PlateSaveReqVO createReqVO) {
return success(plateService.createPlate(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新板材信息表 plate_{N}")
@PreAuthorize("@ss.hasPermission('manage:plate:update')")
// @PreAuthorize("@ss.hasPermission('manage:plate:update')")
@PreAuthorize("@ss.hasAnyPermissions('manage:plate:update','base:plate:update')")
public CommonResult<Boolean> updatePlate(@Valid @RequestBody PlateSaveReqVO updateReqVO) {
plateService.updatePlate(updateReqVO);
return success(true);
@@ -63,7 +65,8 @@ public class PlateController {
@Parameter(name = "id", description = "编号", required = true),
@Parameter(name = "organId", description = "板材所属组织ID")
})
@PreAuthorize("@ss.hasPermission('manage:plate:delete')")
// @PreAuthorize("@ss.hasPermission('manage:plate:delete')")
@PreAuthorize("@ss.hasAnyPermissions('manage:plate:delete','base:plate:delete')")
public CommonResult<Boolean> deletePlate(@RequestParam("id") Long id,
@RequestParam(value = "organId",required = false) Long organId) {
plateService.deletePlate(id,organId);
@@ -73,7 +76,8 @@ public class PlateController {
@GetMapping("/get")
@Operation(summary = "获得板材信息表 plate_{N}")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('manage:plate:query')")
// @PreAuthorize("@ss.hasPermission('manage:plate:query')")
@PreAuthorize("@ss.hasAnyPermissions('manage:plate:query','base:plate:query')")
public CommonResult<PlateRespVO> getPlate(@RequestParam("id") Long id) {
PlateDO plate = plateService.getPlate(id);
return success(BeanUtils.toBean(plate, PlateRespVO.class));
@@ -81,7 +85,8 @@ public class PlateController {
@GetMapping("/page")
@Operation(summary = "获得板材信息表 plate_{N}分页")
@PreAuthorize("@ss.hasPermission('manage:plate:query')")
// @PreAuthorize("@ss.hasPermission('manage:plate:query')")
@PreAuthorize("@ss.hasAnyPermissions('manage:plate:query','base:plate:query')")
public CommonResult<PageResult<PlateRespVO>> getPlatePage(@Valid PlatePageReqVO pageReqVO) {
PageResult<PlateDO> pageResult = plateService.getPlatePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, PlateRespVO.class));
@@ -89,7 +94,8 @@ public class PlateController {
@GetMapping("/export")
@Operation(summary = "导出板材信息")
@PreAuthorize("@ss.hasPermission('manage:plate:export')")
// @PreAuthorize("@ss.hasPermission('manage:plate:export')")
@PreAuthorize("@ss.hasAnyPermissions('manage:plate:export','base:plate:export')")
@OperateLog(type = EXPORT)
public void exportPlateExcel(@Valid PlatePageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
@@ -102,7 +108,8 @@ public class PlateController {
@GetMapping("/get-import-template")
@Operation(summary = "获得导入用户模板")
@PreAuthorize("@ss.hasPermission('manage:plate:export')")
// @PreAuthorize("@ss.hasPermission('manage:plate:export')")
@PreAuthorize("@ss.hasAnyPermissions('manage:plate:export','base:plate:export')")
public void importTemplate(HttpServletResponse response) throws IOException {
// 手动创建导出 demo
List<PlateImportExcelVO> list = Arrays.asList(
@@ -122,7 +129,8 @@ public class PlateController {
@Parameter(name = "updateSupport", description = "是否支持更新，默认为 false", example = "true"),
@Parameter(name = "organId", description = "板材所属组织ID")
})
@PreAuthorize("@ss.hasPermission('manage:plate:import')")
// @PreAuthorize("@ss.hasPermission('manage:plate:import')")
@PreAuthorize("@ss.hasAnyPermissions('manage:plate:import','base:plate:import')")
public void importExcel(@RequestParam("file") MultipartFile file,
@RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport,
@RequestParam(value = "organId") Long organId,