diff --git a/mes/src/main/java/com/wangziyang/mes/technology/controller/SpBomController.java b/mes/src/main/java/com/wangziyang/mes/technology/controller/SpBomController.java index 3df677b..2cfc0df 100644 --- a/mes/src/main/java/com/wangziyang/mes/technology/controller/SpBomController.java +++ b/mes/src/main/java/com/wangziyang/mes/technology/controller/SpBomController.java @@ -1,6 +1,11 @@ package com.wangziyang.mes.technology.controller; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.stereotype.Controller; @@ -8,14 +13,26 @@ import com.wangziyang.mes.common.BaseController; /** *

- * 前端控制器 + * BOM前端控制器 *

* * @author WangZiYang * @since 2020-03-28 */ @Controller -@RequestMapping("/technology/sp-bom") +@RequestMapping("/technology/bom") public class SpBomController extends BaseController { + /** + * 工艺BOM管理界面 + * + * @param model 模型 + * @return 工艺BOM管理界面 + */ + @ApiOperation("工艺BOM管理界面UI") + @ApiImplicitParams({@ApiImplicitParam(name = "model", value = "模型", defaultValue = "模型")}) + @GetMapping("/list-ui") + public String listUI(Model model) { + return "basedata/flowprocess/list"; + } } diff --git a/mes/src/main/java/com/wangziyang/mes/technology/controller/SpFlowOperRelationController.java b/mes/src/main/java/com/wangziyang/mes/technology/controller/SpFlowOperRelationController.java index c3a7f79..1077439 100644 --- a/mes/src/main/java/com/wangziyang/mes/technology/controller/SpFlowOperRelationController.java +++ b/mes/src/main/java/com/wangziyang/mes/technology/controller/SpFlowOperRelationController.java @@ -60,7 +60,7 @@ public class SpFlowOperRelationController extends BaseController { @ApiImplicitParams({@ApiImplicitParam(name = "model", value = "模型", defaultValue = "模型")}) @GetMapping("/list-ui") public String listUI(Model model) { - return "basedata/flowprocess/list"; + return "technology/flowprocess/list"; } @@ -84,7 +84,7 @@ public class SpFlowOperRelationController extends BaseController { List currentSpOperVos = iSpFlowOperRelationService.currentOperViewServer(record.getId()); model.addAttribute("currentOper", currentSpOperVos); } - return "basedata/flowprocess/addOrUpdate"; + return "technology/flowprocess/addOrUpdate"; } diff --git a/mes/src/main/resources/templates/basedata/flowprocess/addOrUpdate.ftl b/mes/src/main/resources/templates/technology/flowprocess/addOrUpdate.ftl similarity index 100% rename from mes/src/main/resources/templates/basedata/flowprocess/addOrUpdate.ftl rename to mes/src/main/resources/templates/technology/flowprocess/addOrUpdate.ftl diff --git a/mes/src/main/resources/templates/basedata/flowprocess/list.ftl b/mes/src/main/resources/templates/technology/flowprocess/list.ftl similarity index 100% rename from mes/src/main/resources/templates/basedata/flowprocess/list.ftl rename to mes/src/main/resources/templates/technology/flowprocess/list.ftl