diff --git a/src/main/java/com/spring/modules/Tooling/controller/ToolController.java b/src/main/java/com/spring/modules/Tooling/controller/ToolController.java index cbab1b17..3cabda01 100644 --- a/src/main/java/com/spring/modules/Tooling/controller/ToolController.java +++ b/src/main/java/com/spring/modules/Tooling/controller/ToolController.java @@ -200,4 +200,19 @@ public class ToolController { .put("msg", ""); } + /** + * @description: 获取工具的下一个编码 + * @author LR + * @date 2024/9/24 18:09 + * @version 1.0 + */ + @RequestMapping(value = "getNextToolId") + public R getNextToolId(@RequestBody IfsTool inData){ + IfsTool ifsTool = toolService.getNextToolId(inData); + return R.ok() + .put("code", 200) + .put("resultRow", ifsTool) + .put("msg", ""); + } + } diff --git a/src/main/java/com/spring/modules/Tooling/service/ToolService.java b/src/main/java/com/spring/modules/Tooling/service/ToolService.java index b906f32a..4242a733 100644 --- a/src/main/java/com/spring/modules/Tooling/service/ToolService.java +++ b/src/main/java/com/spring/modules/Tooling/service/ToolService.java @@ -119,4 +119,12 @@ public interface ToolService { * @version 1.0 */ void removeToolInstanceDate(IfsToolInstanceDate inData); + + /** + * @description: 获取下一个工具实例的编码 + * @author LR + * @date 2024/9/24 18:11 + * @version 1.0 + */ + IfsTool getNextToolId(IfsTool inData); } diff --git a/src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java b/src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java index a4075a28..7983260c 100644 --- a/src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java +++ b/src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java @@ -9,7 +9,6 @@ import com.spring.modules.Tooling.entity.IfsTool; import com.spring.modules.Tooling.entity.IfsToolInstance; import com.spring.modules.Tooling.entity.IfsToolInstanceDate; import com.spring.modules.Tooling.service.ToolService; -import com.spring.modules.base.entity.PersonnelLevel; import com.spring.modules.base.utils.DateUtils; import com.spring.modules.base.utils.HttpClientUtil; import com.spring.modules.base.utils.ResponseData; @@ -715,4 +714,34 @@ public class ToolServiceImpl implements ToolService { //保存新增的数据 toolDao.deleteToolInstanceDate(inData); } + + @Override + public IfsTool getNextToolId(IfsTool inData) { + //公共参数 + //公共参数 + String site = inData.getSite(); + String toolId = inData.getToolId(); + //调用存储过程 + Map resultMap = this.getNextToolId(site, toolId); + toolId = String.valueOf(resultMap.get("nextToolId")); + //重置 + inData.setToolId(toolId); + return inData; + } + + /** + * @description: 获取工具的下一个编码 + * @author LR + * @date 2024/9/24 18:17 + * @version 1.0 + */ + public Map getNextToolId(String site, String toolId) { + List params = new ArrayList<>(); + params.add(site); + params.add(toolId); + //调用存储过程 + List> resultList = procedureDao.getProcedureData("getNextToolId", params); + //处理返回的结果 + return resultList.get(0); + } }