From 18eb8ad4c66fd8515706e2a910ad50ac8f06ba22 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 05 六月 2025 16:58:07 +0800
Subject: [PATCH] 工具管理-增加刃磨出库
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java
index cb806cf..9d82e25 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java
@@ -12,10 +12,12 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.TranslateDictTextUtils;
+import org.jeecg.modules.tms.entity.dto.OutBoundAddDto;
import org.jeecg.modules.tms.entity.dto.OutBoundOrderFlowDto;
import org.jeecg.modules.tms.entity.dto.OutBoundRequestDto;
import org.jeecg.modules.tms.entity.dto.OutboundOrderAndDetailDto;
import org.jeecg.modules.tms.entity.vo.OutboundDetailVo;
+import org.jeecg.modules.tms.entity.vo.SelectOutboundToolVo;
import org.jeecg.modules.tms.enums.OutBillStatus;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -92,6 +94,28 @@
QueryWrapper<OutboundOrder> queryWrapper = QueryGenerator.initQueryWrapper(outboundOrder, parameterMap);
Page<OutboundOrder> page = new Page<OutboundOrder>(pageNo, pageSize);
IPage<OutboundOrder> pageList = outboundOrderService.queryPageList(page, parameterMap);
+ return Result.OK(pageList);
+ }
+
+ @ApiOperation(value="鍑哄簱鐢宠-鏌ヨ鍊熺敤鍑哄簱宸ュ叿鍒楄〃", notes="鍑哄簱鐢宠-鏌ヨ鍊熺敤鍑哄簱宸ュ叿鍒楄〃")
+ @GetMapping(value = "/selectBorrowOutboundToolPageList")
+ public Result<IPage<SelectOutboundToolVo>> queryBorrowOutboundToolPageList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ Page<SelectOutboundToolVo> page = new Page<>(pageNo, pageSize);
+ IPage<SelectOutboundToolVo> pageList = outboundOrderService.queryBorrowOutboundToolPageList(page, parameterMap);
+ return Result.OK(pageList);
+ }
+
+ @ApiOperation(value="鍑哄簱鐢宠-鏌ヨ鍒冪（鍑哄簱宸ュ叿鍒楄〃", notes="鍑哄簱鐢宠-鏌ヨ鍒冪（鍑哄簱宸ュ叿鍒楄〃")
+ @GetMapping(value = "/selectSharpenOutboundToolPageList")
+ public Result<IPage<SelectOutboundToolVo>> querySharpenOutboundToolPageList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ Page<SelectOutboundToolVo> page = new Page<>(pageNo, pageSize);
+ IPage<SelectOutboundToolVo> pageList = outboundOrderService.querySharpenOutboundToolPageList(page, parameterMap);
return Result.OK(pageList);
}
@@ -180,9 +204,17 @@
@AutoLog(value = "鐢宠鍗曟柟寮忓嚭搴�")
@ApiOperation(value = "鐢宠鍗曟柟寮忓嚭搴�", notes = "鐢宠鍗曟柟寮忓嚭搴�")
- @PostMapping(value = "/outBound")
- public Result<?> outBound(@RequestBody List<OutBoundRequestDto> outBoundRequestList) {
- outboundOrderService.outBound(outBoundRequestList);
+ @PostMapping(value = "/outBoundByApply")
+ public Result<?> outBoundByApply(@RequestBody List<OutBoundRequestDto> outBoundRequestList) {
+ outboundOrderService.outBoundByApply(outBoundRequestList);
+ return Result.OK("鍑哄簱鎴愬姛");
+ }
+
+ @AutoLog(value = "鏂板鏂瑰紡鍑哄簱")
+ @ApiOperation(value = "鏂板鏂瑰紡鍑哄簱", notes = "鏂板鏂瑰紡鍑哄簱")
+ @PostMapping(value = "/outBoundByAdd")
+ public Result<?> outBoundByAdd(@RequestBody List<OutBoundAddDto> boundAddList) {
+ outboundOrderService.outBoundByAdd(boundAddList);
return Result.OK("鍑哄簱鎴愬姛");
}
--
Gitblit v1.9.3