From 34580ceb745eaeaf6f8a6188a779c0746a23b02d Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 04 九月 2025 23:18:33 +0800
Subject: [PATCH] art: 热处理入库相关接口
---
src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java | 289 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 150 insertions(+), 139 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java b/src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java
index 0f5d3c9..b52a108 100644
--- a/src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java
+++ b/src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.base.controller;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -9,6 +10,7 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator;
@@ -38,126 +40,126 @@
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
- /**
+/**
* @Description: 绾胯竟浠撳簱淇℃伅
* @Author: jeecg-boot
- * @Date: 2025-06-24
+ * @Date: 2025-06-24
* @Version: V1.0
*/
-@Api(tags="绾胯竟浠撳簱淇℃伅")
+@Api(tags = "绾胯竟浠撳簱淇℃伅")
@RestController
@RequestMapping("/base/lineSideWarehouse")
@Slf4j
public class LineSideWarehouseController extends JeecgController<LineSideWarehouse, ILineSideWarehouseService> {
- @Autowired
- private ILineSideWarehouseService lineSideWarehouseService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param lineSideWarehouse
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "绾胯竟浠撳簱淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="绾胯竟浠撳簱淇℃伅-鍒嗛〉鍒楄〃鏌ヨ", notes="绾胯竟浠撳簱淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<LineSideWarehouse>> queryPageList(LineSideWarehouse lineSideWarehouse,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<LineSideWarehouse> queryWrapper = QueryGenerator.initQueryWrapper(lineSideWarehouse, req.getParameterMap());
- Page<LineSideWarehouse> page = new Page<LineSideWarehouse>(pageNo, pageSize);
- IPage<LineSideWarehouse> pageList = lineSideWarehouseService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param lineSideWarehouse
- * @return
- */
- @AutoLog(value = "绾胯竟浠撳簱淇℃伅-娣诲姞")
- @ApiOperation(value="绾胯竟浠撳簱淇℃伅-娣诲姞", notes="绾胯竟浠撳簱淇℃伅-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody LineSideWarehouse lineSideWarehouse) {
- lineSideWarehouse.setWarehouseStatus(CommonConstant.STATUS_1);
- lineSideWarehouseService.save(lineSideWarehouse);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param lineSideWarehouse
- * @return
- */
- @AutoLog(value = "绾胯竟浠撳簱淇℃伅-缂栬緫")
- @ApiOperation(value="绾胯竟浠撳簱淇℃伅-缂栬緫", notes="绾胯竟浠撳簱淇℃伅-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody LineSideWarehouse lineSideWarehouse) {
- lineSideWarehouseService.updateById(lineSideWarehouse);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎")
- @ApiOperation(value="绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎", notes="绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- lineSideWarehouseService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "绾胯竟浠撳簱淇℃伅-鎵归噺鍒犻櫎")
- @ApiOperation(value="绾胯竟浠撳簱淇℃伅-鎵归噺鍒犻櫎", notes="绾胯竟浠撳簱淇℃伅-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.lineSideWarehouseService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ")
- @ApiOperation(value="绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ", notes="绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<LineSideWarehouse> queryById(@RequestParam(name="id",required=true) String id) {
- LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.getById(id);
- if(lineSideWarehouse==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(lineSideWarehouse);
- }
+ @Autowired
+ private ILineSideWarehouseService lineSideWarehouseService;
/**
- * 瀵煎嚭excel
- *
- * @param request
- * @param lineSideWarehouse
- */
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param lineSideWarehouse
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "绾胯竟浠撳簱淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "绾胯竟浠撳簱淇℃伅-鍒嗛〉鍒楄〃鏌ヨ", notes = "绾胯竟浠撳簱淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<LineSideWarehouse>> queryPageList(LineSideWarehouse lineSideWarehouse,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<LineSideWarehouse> queryWrapper = QueryGenerator.initQueryWrapper(lineSideWarehouse, req.getParameterMap());
+ Page<LineSideWarehouse> page = new Page<LineSideWarehouse>(pageNo, pageSize);
+ IPage<LineSideWarehouse> pageList = lineSideWarehouseService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param lineSideWarehouse
+ * @return
+ */
+ @AutoLog(value = "绾胯竟浠撳簱淇℃伅-娣诲姞")
+ @ApiOperation(value = "绾胯竟浠撳簱淇℃伅-娣诲姞", notes = "绾胯竟浠撳簱淇℃伅-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody LineSideWarehouse lineSideWarehouse) {
+ lineSideWarehouse.setWarehouseStatus(CommonConstant.STATUS_1);
+ lineSideWarehouseService.save(lineSideWarehouse);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param lineSideWarehouse
+ * @return
+ */
+ @AutoLog(value = "绾胯竟浠撳簱淇℃伅-缂栬緫")
+ @ApiOperation(value = "绾胯竟浠撳簱淇℃伅-缂栬緫", notes = "绾胯竟浠撳簱淇℃伅-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> edit(@RequestBody LineSideWarehouse lineSideWarehouse) {
+ lineSideWarehouseService.updateById(lineSideWarehouse);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎", notes = "绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+ lineSideWarehouseService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "绾胯竟浠撳簱淇℃伅-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "绾胯竟浠撳簱淇℃伅-鎵归噺鍒犻櫎", notes = "绾胯竟浠撳簱淇℃伅-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.lineSideWarehouseService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ", notes = "绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<LineSideWarehouse> queryById(@RequestParam(name = "id", required = true) String id) {
+ LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.getById(id);
+ if (lineSideWarehouse == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(lineSideWarehouse);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param lineSideWarehouse
+ */
//@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, LineSideWarehouse lineSideWarehouse) {
@@ -165,42 +167,51 @@
}
/**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
//@RequiresPermissions("base_line_side_warehouse:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, LineSideWarehouse.class);
}
- @AutoLog(value = "绾胯竟搴�-鍚敤&绂佺敤")
- @ApiOperation(value = "绾胯竟搴�-鍚敤&绂佺敤", notes = "绾胯竟搴�-鍚敤&绂佺敤")
- @PutMapping(value = "/active")
- public Result<?> active(@RequestParam(name = "id", required = true) String id) {
- LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.getById(id);
- if (CommonConstant.STATUS_1.equals(lineSideWarehouse.getWarehouseStatus())) {
- lineSideWarehouse.setWarehouseStatus(CommonConstant.STATUS_0);
- } else {
- lineSideWarehouse.setWarehouseStatus(CommonConstant.STATUS_1);
- }
- lineSideWarehouseService.updateById(lineSideWarehouse);
- return Result.ok("鎿嶄綔鎴愬姛锛�");
- }
+ @AutoLog(value = "绾胯竟搴�-鍚敤&绂佺敤")
+ @ApiOperation(value = "绾胯竟搴�-鍚敤&绂佺敤", notes = "绾胯竟搴�-鍚敤&绂佺敤")
+ @PutMapping(value = "/active")
+ public Result<?> active(@RequestParam(name = "id", required = true) String id) {
+ LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.getById(id);
+ if (CommonConstant.STATUS_1.equals(lineSideWarehouse.getWarehouseStatus())) {
+ lineSideWarehouse.setWarehouseStatus(CommonConstant.STATUS_0);
+ } else {
+ lineSideWarehouse.setWarehouseStatus(CommonConstant.STATUS_1);
+ }
+ lineSideWarehouseService.updateById(lineSideWarehouse);
+ return Result.ok("鎿嶄綔鎴愬姛锛�");
+ }
- //@AutoLog(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ")
- @ApiOperation(value="绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ", notes="绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryByFactoryId")
- public Result<LineSideWarehouse> queryByFactoryId(@RequestParam(name="factoryId") String factoryId) {
- LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.queryByFactoryId(factoryId);
- if(lineSideWarehouse==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(lineSideWarehouse);
- }
+ @ApiOperation(value = "绾胯竟浠撳簱淇℃伅-閫氳繃浜х嚎ID鏌ヨ", notes = "绾胯竟浠撳簱淇℃伅-閫氳繃浜х嚎ID鏌ヨ")
+ @GetMapping(value = "/queryByFactoryId")
+ public Result<LineSideWarehouse> queryByFactoryId(@RequestParam(name = "factoryId") String factoryId) {
+ LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.queryByFactoryId(factoryId);
+ if (lineSideWarehouse == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(lineSideWarehouse);
+ }
+
+ @ApiOperation(value = "绾胯竟浠撳簱淇℃伅-閫氳繃浜х嚎鍒嗙被鏌ヨ", notes = "绾胯竟浠撳簱淇℃伅-閫氳繃浜х嚎鍒嗙被鏌ヨ")
+ @GetMapping(value = "/queryByProductionType")
+ public Result<List<LineSideWarehouse>> queryByProductionType(@RequestParam(name = "productionType") String productionType) {
+ List<LineSideWarehouse> list = lineSideWarehouseService.queryByProductionType(productionType);
+ if (list == null) {
+ return Result.OK(Collections.emptyList());
+ }
+ return Result.OK(list);
+ }
}
--
Gitblit v1.9.3