diff --git a/ant-design-vue-jeecg/src/views/starehouse/admin/StarehouseList.vue b/ant-design-vue-jeecg/src/views/starehouse/admin/StarehouseList.vue new file mode 100644 index 00000000..d44ef7ec --- /dev/null +++ b/ant-design-vue-jeecg/src/views/starehouse/admin/StarehouseList.vue @@ -0,0 +1,257 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseForm.vue b/ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseForm.vue new file mode 100644 index 00000000..b7698e44 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseForm.vue @@ -0,0 +1,160 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseModal.vue b/ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseModal.vue new file mode 100644 index 00000000..a0d225f9 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseModal__Style#Drawer.vue new file mode 100644 index 00000000..bf8593e7 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/controller/StarehouseController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/controller/StarehouseController.java new file mode 100644 index 00000000..37fe40b8 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/controller/StarehouseController.java @@ -0,0 +1,172 @@ +package org.jeecg.modules.demo.starehouse.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.demo.starehouse.entity.Starehouse; +import org.jeecg.modules.demo.starehouse.service.IStarehouseService; + +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: 仓库管理 + * @Author: jeecg-boot + * @Date: 2023-01-06 + * @Version: V1.0 + */ +@Api(tags="仓库管理") +@RestController +@RequestMapping("/starehouse/starehouse") +@Slf4j +public class StarehouseController extends JeecgController { + @Autowired + private IStarehouseService starehouseService; + + /** + * 分页列表查询 + * + * @param starehouse + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "仓库管理-分页列表查询") + @ApiOperation(value="仓库管理-分页列表查询", notes="仓库管理-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(Starehouse starehouse, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(starehouse, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = starehouseService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param starehouse + * @return + */ + @AutoLog(value = "仓库管理-添加") + @ApiOperation(value="仓库管理-添加", notes="仓库管理-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody Starehouse starehouse) { + starehouseService.save(starehouse); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param starehouse + * @return + */ + @AutoLog(value = "仓库管理-编辑") + @ApiOperation(value="仓库管理-编辑", notes="仓库管理-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody Starehouse starehouse) { + starehouseService.updateById(starehouse); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "仓库管理-通过id删除") + @ApiOperation(value="仓库管理-通过id删除", notes="仓库管理-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + starehouseService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "仓库管理-批量删除") + @ApiOperation(value="仓库管理-批量删除", notes="仓库管理-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.starehouseService.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 queryById(@RequestParam(name="id",required=true) String id) { + Starehouse starehouse = starehouseService.getById(id); + if(starehouse==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(starehouse); + } + + /** + * 导出excel + * + * @param request + * @param starehouse + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, Starehouse starehouse) { + return super.exportXls(request, starehouse, Starehouse.class, "仓库管理"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, Starehouse.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/entity/Starehouse.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/entity/Starehouse.java new file mode 100644 index 00000000..96fdd2a4 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/entity/Starehouse.java @@ -0,0 +1,99 @@ +package org.jeecg.modules.demo.starehouse.entity; + + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 仓库管理 + * @Author: jeecg-boot + * @Date: 2023-01-06 + * @Version: V1.0 + */ +@Data +@TableName("starehouse") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="starehouse对象", description="仓库管理") +public class Starehouse implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /**名称*/ + @Excel(name = "名称", width = 15) + @ApiModelProperty(value = "名称") + private String name; + /**部门*/ + @Excel(name = "部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") + @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") + @ApiModelProperty(value = "部门") + private String partmentId; + /**部门*/ + @Excel(name = "部门", width = 15) + @ApiModelProperty(value = "部门") + private String partmentnae; + /**是否专属*/ + @Excel(name = "是否专属", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "是否专属") + private Integer exclusive; + /**仓库存储规则*/ + @Excel(name = "仓库存储规则", width = 15, dicCode = "goods_category") + @Dict(dicCode = "goods_category") + @ApiModelProperty(value = "仓库存储规则") + private java.lang.String type; + /**地址*/ + @Excel(name = "地址", width = 15) + @ApiModelProperty(value = "地址") + private String address; + /**管理员*/ + @Excel(name = "管理员", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") + @ApiModelProperty(value = "管理员") + private String userId; + /**管理员*/ + @Excel(name = "管理员", width = 15) + @ApiModelProperty(value = "管理员") + private String username; + /**库存预定*/ + @Excel(name = "库存预定", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "库存预定") + private String state; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/mapper/StarehouseMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/mapper/StarehouseMapper.java new file mode 100644 index 00000000..3336198b --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/mapper/StarehouseMapper.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.demo.starehouse.mapper; + + + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.starehouse.entity.Starehouse; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 仓库管理 + * @Author: jeecg-boot + * @Date: 2023-01-06 + * @Version: V1.0 + */ +public interface StarehouseMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/mapper/xml/StarehouseMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/mapper/xml/StarehouseMapper.xml new file mode 100644 index 00000000..a75a853a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/mapper/xml/StarehouseMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/service/IStarehouseService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/service/IStarehouseService.java new file mode 100644 index 00000000..a08ad778 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/service/IStarehouseService.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.demo.starehouse.service; + + + +import org.jeecg.modules.demo.starehouse.entity.Starehouse; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 仓库管理 + * @Author: jeecg-boot + * @Date: 2023-01-06 + * @Version: V1.0 + */ +public interface IStarehouseService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/service/impl/StarehouseServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/service/impl/StarehouseServiceImpl.java new file mode 100644 index 00000000..9b1ce33d --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/service/impl/StarehouseServiceImpl.java @@ -0,0 +1,21 @@ +package org.jeecg.modules.demo.starehouse.service.impl; + + + +import org.jeecg.modules.demo.starehouse.entity.Starehouse; +import org.jeecg.modules.demo.starehouse.mapper.StarehouseMapper; +import org.jeecg.modules.demo.starehouse.service.IStarehouseService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 仓库管理 + * @Author: jeecg-boot + * @Date: 2023-01-06 + * @Version: V1.0 + */ +@Service +public class StarehouseServiceImpl extends ServiceImpl implements IStarehouseService { + +}