From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期三, 25 六月 2025 11:51:38 +0800 Subject: [PATCH] Merge branch 'mdc_hyjs_master' --- lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/GoodsShelvesController.java | 194 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 194 insertions(+), 0 deletions(-) diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/GoodsShelvesController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/GoodsShelvesController.java new file mode 100644 index 0000000..18e7f87 --- /dev/null +++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/GoodsShelvesController.java @@ -0,0 +1,194 @@ +package org.jeecg.modules.tms.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +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.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.tms.entity.GoodsShelves; +import org.jeecg.modules.tms.entity.vo.DictVo; +import org.jeecg.modules.tms.service.IGoodsShelvesService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: tms_goods_shelves + * @Author: jeecg-boot + * @Date: 2025-05-08 + * @Version: V1.0 + */ +@Api(tags="tms_goods_shelves") +@RestController +@RequestMapping("/tms/goodsShelves") +@Slf4j +public class GoodsShelvesController extends JeecgController<GoodsShelves, IGoodsShelvesService> { + @Autowired + private IGoodsShelvesService goodsShelvesService; + + /** + * 鍒嗛〉鍒楄〃鏌ヨ + * + * @param goodsShelves + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "tms_goods_shelves-鍒嗛〉鍒楄〃鏌ヨ") + @ApiOperation(value="tms_goods_shelves-鍒嗛〉鍒楄〃鏌ヨ", notes="tms_goods_shelves-鍒嗛〉鍒楄〃鏌ヨ") + @GetMapping(value = "/list") + public Result<IPage<GoodsShelves>> queryPageList(GoodsShelves goodsShelves, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Map<String, String[]> parameterMap = req.getParameterMap(); + Page<GoodsShelves> page = new Page<GoodsShelves>(pageNo, pageSize); + IPage<GoodsShelves> pageList = goodsShelvesService.queryPageList(page, parameterMap); + return Result.OK(pageList); + } + + @ApiOperation(value="tms_goods_shelves-閫氳繃浠撳簱id鏌ヨ璐ф灦瀛楀吀鏁版嵁", notes="tms_goods_shelves-閫氳繃浠撳簱id鏌ヨ璐ф灦瀛楀吀鏁版嵁") + @GetMapping(value = "queryGoodsShelvesDictList") + public Result<List<DictVo>> queryGoodsShelvesDictList(@RequestParam("warehouseId") String warehouseId) { + List<DictVo> list = goodsShelvesService.queryGoodsShelvesDictList(warehouseId); + return Result.OK(list); + } + + + @ApiOperation(value="tms_goods_shelves-閫氳繃浠撳簱id銆佽揣鏋剁紪鍙锋煡璇㈣揣鏋跺眰鏁板瓧鍏告暟鎹�", notes="tms_goods_shelves-閫氳繃浠撳簱id銆佽揣鏋剁紪鍙锋煡璇㈣揣鏋跺眰鏁板瓧鍏告暟鎹�") + @GetMapping(value = "queryGoodsShelvesStoreyDictList") + public Result<List<DictVo>> queryGoodsShelvesStoreyDictList(@RequestParam("warehouseId") String warehouseId, + @RequestParam("shelfNumber") String shelfNumber) { + List<DictVo> list = goodsShelvesService.queryGoodsShelvesStoreyDictList(warehouseId, shelfNumber); + return Result.OK(list); + } + + /** + * 娣诲姞 + * + * @param goodsShelves + * @return + */ + @AutoLog(value = "tms_goods_shelves-娣诲姞") + @ApiOperation(value="tms_goods_shelves-娣诲姞", notes="tms_goods_shelves-娣诲姞") + //@RequiresPermissions("org.jeecg.modules:tms_goods_shelves:add") + @PostMapping(value = "/add") + public Result<String> add(@RequestBody GoodsShelves goodsShelves) { + goodsShelvesService.save(goodsShelves); + return Result.OK("娣诲姞鎴愬姛锛�"); + } + + /** + * 缂栬緫 + * + * @param goodsShelves + * @return + */ + @AutoLog(value = "tms_goods_shelves-缂栬緫") + @ApiOperation(value="tms_goods_shelves-缂栬緫", notes="tms_goods_shelves-缂栬緫") + //@RequiresPermissions("org.jeecg.modules:tms_goods_shelves:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result<String> edit(@RequestBody GoodsShelves goodsShelves) { + goodsShelvesService.updateById(goodsShelves); + return Result.OK("缂栬緫鎴愬姛!"); + } + + /** + * 閫氳繃id鍒犻櫎 + * + * @param id + * @return + */ + @AutoLog(value = "tms_goods_shelves-閫氳繃id鍒犻櫎") + @ApiOperation(value="tms_goods_shelves-閫氳繃id鍒犻櫎", notes="tms_goods_shelves-閫氳繃id鍒犻櫎") + //@RequiresPermissions("org.jeecg.modules:tms_goods_shelves:delete") + @DeleteMapping(value = "/delete") + public Result<String> delete(@RequestParam(name="id",required=true) String id) { + goodsShelvesService.removeById(id); + return Result.OK("鍒犻櫎鎴愬姛!"); + } + + /** + * 鎵归噺鍒犻櫎 + * + * @param ids + * @return + */ + @AutoLog(value = "tms_goods_shelves-鎵归噺鍒犻櫎") + @ApiOperation(value="tms_goods_shelves-鎵归噺鍒犻櫎", notes="tms_goods_shelves-鎵归噺鍒犻櫎") + //@RequiresPermissions("org.jeecg.modules:tms_goods_shelves:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.goodsShelvesService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("鎵归噺鍒犻櫎鎴愬姛!"); + } + + /** + * 閫氳繃id鏌ヨ + * + * @param id + * @return + */ + //@AutoLog(value = "tms_goods_shelves-閫氳繃id鏌ヨ") + @ApiOperation(value="tms_goods_shelves-閫氳繃id鏌ヨ", notes="tms_goods_shelves-閫氳繃id鏌ヨ") + @GetMapping(value = "/queryById") + public Result<GoodsShelves> queryById(@RequestParam(name="id",required=true) String id) { + GoodsShelves goodsShelves = goodsShelvesService.getById(id); + if(goodsShelves==null) { + return Result.error("鏈壘鍒板搴旀暟鎹�"); + } + return Result.OK(goodsShelves); + } + + /** + * 瀵煎嚭excel + * + * @param request + * @param goodsShelves + */ + //@RequiresPermissions("org.jeecg.modules:tms_goods_shelves:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, GoodsShelves goodsShelves) { + return super.exportXls(request, goodsShelves, GoodsShelves.class, "tms_goods_shelves"); + } + + /** + * 閫氳繃excel瀵煎叆鏁版嵁 + * + * @param request + * @param response + * @return + */ + //@RequiresPermissions("tms_goods_shelves:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, GoodsShelves.class); + } + +} -- Gitblit v1.9.3