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-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、工作台逾期订单恢复为平铺；2、新功能部件、分堆打包、cad三维看图等接口权限梳理；3、装配设置顶级部件关联item明细表，修复明细项删除后部件可见；

Browse Source
This commit is contained in:
gaoqr
2026-04-20 18:01:29 +08:00
parent 6558a11228
commit a11ec028fd
13 changed files with 83 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/assemblyconfig/AssemblyConfigController.java
+8
View File
@@ -12,6 +12,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -40,6 +41,7 @@ public class AssemblyConfigController {
@PostMapping("/order/import")
@Operation(summary = "导入装配顺序")
@PreAuthorize("@ss.hasPermission('systemconfig:assemblyconfig:import')")
public CommonResult<Boolean> importAssemblyConfigFromOrders(@RequestBody @Valid AssemblyConfigImportReqVO reqVO) {
assemblyConfigService.importAssemblyConfigFromOrders(reqVO);
return CommonResult.success(true);
@@ -47,6 +49,7 @@ public class AssemblyConfigController {
@GetMapping("/list")
@Operation(summary = "查询组织装配设置列表")
@PreAuthorize("@ss.hasPermission('systemconfig:assemblyconfig:query')")
public CommonResult<List<AssemblyConfigListRespVO>> getAssemblyConfigList() {
return CommonResult.success(assemblyConfigService.getOrgAssemblyConfigList());
}
@@ -54,6 +57,7 @@ public class AssemblyConfigController {
@GetMapping("/{configId}")
@Operation(summary = "查询装配设置")
@Parameter(name = "configId", description = "装配设置编号", required = true)
@PreAuthorize("@ss.hasPermission('systemconfig:assemblyconfig:query')")
public CommonResult<AssemblyConfigRespVO> getAssemblyConfig(@PathVariable Long configId) {
return CommonResult.success(assemblyConfigService.getAssemblyConfig(configId));
}
@@ -61,6 +65,7 @@ public class AssemblyConfigController {
@PostMapping("/{configId}")
@Operation(summary = "待选部件转加工部件")
@Parameter(name = "configId", description = "装配设置编号", required = true)
@PreAuthorize("@ss.hasPermission('systemconfig:assemblyconfig:save')")
public CommonResult<Boolean> doConfig(@PathVariable Long configId) {
assemblyConfigService.doConfig(configId);
return CommonResult.success(true);
@@ -69,6 +74,7 @@ public class AssemblyConfigController {
@PostMapping("/new/{configId}")
@Operation(summary = "新增加工部件")
@Parameter(name = "configId", description = "装配设置编号", required = true)
@PreAuthorize("@ss.hasPermission('systemconfig:assemblyconfig:save')")
public CommonResult<Boolean> newConfig(@PathVariable Long configId) {
assemblyConfigService.newConfig(configId);
return CommonResult.success(true);
@@ -77,6 +83,7 @@ public class AssemblyConfigController {
@DeleteMapping("/{configId}")
@Operation(summary = "删除已配置的加工部件，恢复到待选")
@Parameter(name = "configId", description = "装配设置编号", required = true)
@PreAuthorize("@ss.hasPermission('systemconfig:assemblyconfig:delete')")
public CommonResult<Boolean> removeConfigured(@PathVariable Long configId) {
assemblyConfigService.delete(configId);
return CommonResult.success(true);
@@ -84,6 +91,7 @@ public class AssemblyConfigController {
@PostMapping("/save")
@Operation(summary = "保存装配设置")
@PreAuthorize("@ss.hasPermission('systemconfig:assemblyconfig:save')")
public CommonResult<Boolean> saveAssemblyConfig(@RequestBody AssemblyConfigSaveReqVO reqVO) {
assemblyConfigService.saveConfig(reqVO);
return CommonResult.success(true);