Browse Source

仓库库区代码生成

lazhaoqian 4 years ago
parent
commit
a5d5140b31
24 changed files with 1673 additions and 0 deletions
  1. 128 0
      blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/StorageDesc.java
  2. 138 0
      blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/StorageType.java
  3. 97 0
      blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/StorageTypeDesc.java
  4. 36 0
      blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/StorageDescVO.java
  5. 36 0
      blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/StorageTypeDescVO.java
  6. 36 0
      blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/StorageTypeVO.java
  7. 126 0
      blade-service/blade-client/src/main/java/org/springblade/client/controller/StorageDescController.java
  8. 126 0
      blade-service/blade-client/src/main/java/org/springblade/client/controller/StorageTypeController.java
  9. 126 0
      blade-service/blade-client/src/main/java/org/springblade/client/controller/StorageTypeDescController.java
  10. 128 0
      blade-service/blade-client/src/main/java/org/springblade/client/entity/StorageDesc.java
  11. 138 0
      blade-service/blade-client/src/main/java/org/springblade/client/entity/StorageType.java
  12. 97 0
      blade-service/blade-client/src/main/java/org/springblade/client/entity/StorageTypeDesc.java
  13. 42 0
      blade-service/blade-client/src/main/java/org/springblade/client/mapper/StorageDescMapper.java
  14. 31 0
      blade-service/blade-client/src/main/java/org/springblade/client/mapper/StorageDescMapper.xml
  15. 42 0
      blade-service/blade-client/src/main/java/org/springblade/client/mapper/StorageTypeDescMapper.java
  16. 25 0
      blade-service/blade-client/src/main/java/org/springblade/client/mapper/StorageTypeDescMapper.xml
  17. 42 0
      blade-service/blade-client/src/main/java/org/springblade/client/mapper/StorageTypeMapper.java
  18. 33 0
      blade-service/blade-client/src/main/java/org/springblade/client/mapper/StorageTypeMapper.xml
  19. 41 0
      blade-service/blade-client/src/main/java/org/springblade/client/service/IStorageDescService.java
  20. 41 0
      blade-service/blade-client/src/main/java/org/springblade/client/service/IStorageTypeDescService.java
  21. 41 0
      blade-service/blade-client/src/main/java/org/springblade/client/service/IStorageTypeService.java
  22. 41 0
      blade-service/blade-client/src/main/java/org/springblade/client/service/impl/StorageDescServiceImpl.java
  23. 41 0
      blade-service/blade-client/src/main/java/org/springblade/client/service/impl/StorageTypeDescServiceImpl.java
  24. 41 0
      blade-service/blade-client/src/main/java/org/springblade/client/service/impl/StorageTypeServiceImpl.java

+ 128 - 0
blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/StorageDesc.java

@@ -0,0 +1,128 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 库区表实体类
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+@Data
+@TableName("basic_storage_desc")
+@ApiModel(value = "StorageDesc对象", description = "库区表")
+public class StorageDesc implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 主键
+	*/
+		@ApiModelProperty(value = "主键")
+		private Long id;
+	/**
+	* 仓库编码
+	*/
+		@ApiModelProperty(value = "仓库编码")
+		private String code;
+	/**
+	* 仓库名称
+	*/
+		@ApiModelProperty(value = "仓库名称")
+		private String cname;
+	/**
+	* 地址
+	*/
+		@ApiModelProperty(value = "地址")
+		private String addr;
+	/**
+	* 联系人
+	*/
+		@ApiModelProperty(value = "联系人")
+		private String attn;
+	/**
+	* 电话
+	*/
+		@ApiModelProperty(value = "电话")
+		private String tel;
+	/**
+	* 是否计费 0 是 1 否
+	*/
+		@ApiModelProperty(value = "是否计费 0 是 1 否")
+		private Integer iffee;
+	/**
+	* 库容
+	*/
+		@ApiModelProperty(value = "库容")
+		private BigDecimal storageCapacity;
+	/**
+	* 备注
+	*/
+		@ApiModelProperty(value = "备注")
+		private String remarks;
+	/**
+	* 版本
+	*/
+		@ApiModelProperty(value = "版本")
+		private String version;
+	/**
+	* 创建人
+	*/
+		@ApiModelProperty(value = "创建人")
+		private Long createUser;
+	/**
+	* 创建部门
+	*/
+		@ApiModelProperty(value = "创建部门")
+		private Long createDept;
+	/**
+	* 创建时间
+	*/
+		@ApiModelProperty(value = "创建时间")
+		private LocalDateTime createTime;
+	/**
+	* 修改人
+	*/
+		@ApiModelProperty(value = "修改人")
+		private Long updateUser;
+	/**
+	* 修改时间
+	*/
+		@ApiModelProperty(value = "修改时间")
+		private LocalDateTime updateTime;
+	/**
+	* 状态(0 正常 1停用)
+	*/
+		@ApiModelProperty(value = "状态(0 正常 1停用)")
+		private Integer status;
+	/**
+	* 是否已删除(0 否 1是)
+	*/
+		@ApiModelProperty(value = "是否已删除(0 否 1是)")
+		private Integer isDeleted;
+
+
+}

+ 138 - 0
blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/StorageType.java

@@ -0,0 +1,138 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 仓库实体类
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+@Data
+@TableName("basic_storage_type")
+@ApiModel(value = "StorageType对象", description = "仓库")
+public class StorageType implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 主键
+	*/
+		@ApiModelProperty(value = "主键")
+		private Long id;
+	/**
+	* 父主键
+	*/
+		@ApiModelProperty(value = "父主键")
+		private Long parentId;
+	/**
+	* 祖籍列表
+	*/
+		@ApiModelProperty(value = "祖籍列表")
+		private String ancestors;
+	/**
+	* 仓库编码
+	*/
+		@ApiModelProperty(value = "仓库编码")
+		private String code;
+	/**
+	* 仓库名称
+	*/
+		@ApiModelProperty(value = "仓库名称")
+		private String cname;
+	/**
+	* 地址
+	*/
+		@ApiModelProperty(value = "地址")
+		private String addr;
+	/**
+	* 联系人
+	*/
+		@ApiModelProperty(value = "联系人")
+		private String attn;
+	/**
+	* 电话
+	*/
+		@ApiModelProperty(value = "电话")
+		private String tel;
+	/**
+	* 库容
+	*/
+		@ApiModelProperty(value = "库容")
+		private BigDecimal storageCapacity;
+	/**
+	* 排序
+	*/
+		@ApiModelProperty(value = "排序")
+		private Long sort;
+	/**
+	* 备注
+	*/
+		@ApiModelProperty(value = "备注")
+		private String remarks;
+	/**
+	* 版本
+	*/
+		@ApiModelProperty(value = "版本")
+		private String version;
+	/**
+	* 创建人
+	*/
+		@ApiModelProperty(value = "创建人")
+		private Long createUser;
+	/**
+	* 创建部门
+	*/
+		@ApiModelProperty(value = "创建部门")
+		private Long createDept;
+	/**
+	* 创建时间
+	*/
+		@ApiModelProperty(value = "创建时间")
+		private LocalDateTime createTime;
+	/**
+	* 修改人
+	*/
+		@ApiModelProperty(value = "修改人")
+		private Long updateUser;
+	/**
+	* 修改时间
+	*/
+		@ApiModelProperty(value = "修改时间")
+		private LocalDateTime updateTime;
+	/**
+	* 状态(0 正常 1停用)
+	*/
+		@ApiModelProperty(value = "状态(0 正常 1停用)")
+		private Integer status;
+	/**
+	* 是否已删除(0 否 1是)
+	*/
+		@ApiModelProperty(value = "是否已删除(0 否 1是)")
+		private Integer isDeleted;
+
+
+}

+ 97 - 0
blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/StorageTypeDesc.java

@@ -0,0 +1,97 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 仓库-库区对应表实体类
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+@Data
+@TableName("basic_storage_type_desc")
+@ApiModel(value = "StorageTypeDesc对象", description = "仓库-库区对应表")
+public class StorageTypeDesc implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 主键
+	*/
+		@ApiModelProperty(value = "主键")
+		private Long id;
+	/**
+	* 仓库idid
+	*/
+		@ApiModelProperty(value = "仓库idid")
+		private Long storageTypeId;
+	/**
+	* 库区id
+	*/
+		@ApiModelProperty(value = "库区id")
+		private Long storageId;
+	/**
+	* 版本
+	*/
+		@ApiModelProperty(value = "版本")
+		private String version;
+	/**
+	* 创建人
+	*/
+		@ApiModelProperty(value = "创建人")
+		private Long createUser;
+	/**
+	* 创建部门
+	*/
+		@ApiModelProperty(value = "创建部门")
+		private Long createDept;
+	/**
+	* 创建时间
+	*/
+		@ApiModelProperty(value = "创建时间")
+		private LocalDateTime createTime;
+	/**
+	* 修改人
+	*/
+		@ApiModelProperty(value = "修改人")
+		private Long updateUser;
+	/**
+	* 修改时间
+	*/
+		@ApiModelProperty(value = "修改时间")
+		private LocalDateTime updateTime;
+	/**
+	* 状态(0 正常 1停用)
+	*/
+		@ApiModelProperty(value = "状态(0 正常 1停用)")
+		private Integer status;
+	/**
+	* 是否已删除(0 否 1是)
+	*/
+		@ApiModelProperty(value = "是否已删除(0 否 1是)")
+		private Integer isDeleted;
+
+
+}

+ 36 - 0
blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/StorageDescVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.vo;
+
+import org.springblade.client.entity.StorageDesc;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 库区表视图实体类
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "StorageDescVO对象", description = "库区表")
+public class StorageDescVO extends StorageDesc {
+	private static final long serialVersionUID = 1L;
+
+}

+ 36 - 0
blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/StorageTypeDescVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.vo;
+
+import org.springblade.client.entity.StorageTypeDesc;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 仓库-库区对应表视图实体类
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "StorageTypeDescVO对象", description = "仓库-库区对应表")
+public class StorageTypeDescVO extends StorageTypeDesc {
+	private static final long serialVersionUID = 1L;
+
+}

+ 36 - 0
blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/StorageTypeVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.vo;
+
+import org.springblade.client.entity.StorageType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 仓库视图实体类
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "StorageTypeVO对象", description = "仓库")
+public class StorageTypeVO extends StorageType {
+	private static final long serialVersionUID = 1L;
+
+}

+ 126 - 0
blade-service/blade-client/src/main/java/org/springblade/client/controller/StorageDescController.java

@@ -0,0 +1,126 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.client.entity.StorageDesc;
+import org.springblade.client.vo.StorageDescVO;
+import org.springblade.client.service.IStorageDescService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 库区表 控制器
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/storagedesc")
+@Api(value = "库区表", tags = "库区表接口")
+public class StorageDescController extends BladeController {
+
+	private final IStorageDescService storageDescService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入storageDesc")
+	public R<StorageDesc> detail(StorageDesc storageDesc) {
+		StorageDesc detail = storageDescService.getOne(Condition.getQueryWrapper(storageDesc));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 库区表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入storageDesc")
+	public R<IPage<StorageDesc>> list(StorageDesc storageDesc, Query query) {
+		IPage<StorageDesc> pages = storageDescService.page(Condition.getPage(query), Condition.getQueryWrapper(storageDesc));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 库区表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入storageDesc")
+	public R<IPage<StorageDescVO>> page(StorageDescVO storageDesc, Query query) {
+		IPage<StorageDescVO> pages = storageDescService.selectStorageDescPage(Condition.getPage(query), storageDesc);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 库区表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入storageDesc")
+	public R save(@Valid @RequestBody StorageDesc storageDesc) {
+		return R.status(storageDescService.save(storageDesc));
+	}
+
+	/**
+	 * 修改 库区表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入storageDesc")
+	public R update(@Valid @RequestBody StorageDesc storageDesc) {
+		return R.status(storageDescService.updateById(storageDesc));
+	}
+
+	/**
+	 * 新增或修改 库区表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入storageDesc")
+	public R submit(@Valid @RequestBody StorageDesc storageDesc) {
+		return R.status(storageDescService.saveOrUpdate(storageDesc));
+	}
+
+	
+	/**
+	 * 删除 库区表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(storageDescService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

+ 126 - 0
blade-service/blade-client/src/main/java/org/springblade/client/controller/StorageTypeController.java

@@ -0,0 +1,126 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.client.entity.StorageType;
+import org.springblade.client.vo.StorageTypeVO;
+import org.springblade.client.service.IStorageTypeService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 仓库 控制器
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/storagetype")
+@Api(value = "仓库", tags = "仓库接口")
+public class StorageTypeController extends BladeController {
+
+	private final IStorageTypeService storageTypeService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入storageType")
+	public R<StorageType> detail(StorageType storageType) {
+		StorageType detail = storageTypeService.getOne(Condition.getQueryWrapper(storageType));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 仓库
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入storageType")
+	public R<IPage<StorageType>> list(StorageType storageType, Query query) {
+		IPage<StorageType> pages = storageTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(storageType));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 仓库
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入storageType")
+	public R<IPage<StorageTypeVO>> page(StorageTypeVO storageType, Query query) {
+		IPage<StorageTypeVO> pages = storageTypeService.selectStorageTypePage(Condition.getPage(query), storageType);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 仓库
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入storageType")
+	public R save(@Valid @RequestBody StorageType storageType) {
+		return R.status(storageTypeService.save(storageType));
+	}
+
+	/**
+	 * 修改 仓库
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入storageType")
+	public R update(@Valid @RequestBody StorageType storageType) {
+		return R.status(storageTypeService.updateById(storageType));
+	}
+
+	/**
+	 * 新增或修改 仓库
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入storageType")
+	public R submit(@Valid @RequestBody StorageType storageType) {
+		return R.status(storageTypeService.saveOrUpdate(storageType));
+	}
+
+	
+	/**
+	 * 删除 仓库
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(storageTypeService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

+ 126 - 0
blade-service/blade-client/src/main/java/org/springblade/client/controller/StorageTypeDescController.java

@@ -0,0 +1,126 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.client.entity.StorageTypeDesc;
+import org.springblade.client.vo.StorageTypeDescVO;
+import org.springblade.client.service.IStorageTypeDescService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 仓库-库区对应表 控制器
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/storagetypedesc")
+@Api(value = "仓库-库区对应表", tags = "仓库-库区对应表接口")
+public class StorageTypeDescController extends BladeController {
+
+	private final IStorageTypeDescService storageTypeDescService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入storageTypeDesc")
+	public R<StorageTypeDesc> detail(StorageTypeDesc storageTypeDesc) {
+		StorageTypeDesc detail = storageTypeDescService.getOne(Condition.getQueryWrapper(storageTypeDesc));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 仓库-库区对应表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入storageTypeDesc")
+	public R<IPage<StorageTypeDesc>> list(StorageTypeDesc storageTypeDesc, Query query) {
+		IPage<StorageTypeDesc> pages = storageTypeDescService.page(Condition.getPage(query), Condition.getQueryWrapper(storageTypeDesc));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 仓库-库区对应表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入storageTypeDesc")
+	public R<IPage<StorageTypeDescVO>> page(StorageTypeDescVO storageTypeDesc, Query query) {
+		IPage<StorageTypeDescVO> pages = storageTypeDescService.selectStorageTypeDescPage(Condition.getPage(query), storageTypeDesc);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 仓库-库区对应表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入storageTypeDesc")
+	public R save(@Valid @RequestBody StorageTypeDesc storageTypeDesc) {
+		return R.status(storageTypeDescService.save(storageTypeDesc));
+	}
+
+	/**
+	 * 修改 仓库-库区对应表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入storageTypeDesc")
+	public R update(@Valid @RequestBody StorageTypeDesc storageTypeDesc) {
+		return R.status(storageTypeDescService.updateById(storageTypeDesc));
+	}
+
+	/**
+	 * 新增或修改 仓库-库区对应表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入storageTypeDesc")
+	public R submit(@Valid @RequestBody StorageTypeDesc storageTypeDesc) {
+		return R.status(storageTypeDescService.saveOrUpdate(storageTypeDesc));
+	}
+
+	
+	/**
+	 * 删除 仓库-库区对应表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(storageTypeDescService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

+ 128 - 0
blade-service/blade-client/src/main/java/org/springblade/client/entity/StorageDesc.java

@@ -0,0 +1,128 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 库区表实体类
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+@Data
+@TableName("basic_storage_desc")
+@ApiModel(value = "StorageDesc对象", description = "库区表")
+public class StorageDesc implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 主键
+	*/
+		@ApiModelProperty(value = "主键")
+		private Long id;
+	/**
+	* 仓库编码
+	*/
+		@ApiModelProperty(value = "仓库编码")
+		private String code;
+	/**
+	* 仓库名称
+	*/
+		@ApiModelProperty(value = "仓库名称")
+		private String cname;
+	/**
+	* 地址
+	*/
+		@ApiModelProperty(value = "地址")
+		private String addr;
+	/**
+	* 联系人
+	*/
+		@ApiModelProperty(value = "联系人")
+		private String attn;
+	/**
+	* 电话
+	*/
+		@ApiModelProperty(value = "电话")
+		private String tel;
+	/**
+	* 是否计费 0 是 1 否
+	*/
+		@ApiModelProperty(value = "是否计费 0 是 1 否")
+		private Integer iffee;
+	/**
+	* 库容
+	*/
+		@ApiModelProperty(value = "库容")
+		private BigDecimal storageCapacity;
+	/**
+	* 备注
+	*/
+		@ApiModelProperty(value = "备注")
+		private String remarks;
+	/**
+	* 版本
+	*/
+		@ApiModelProperty(value = "版本")
+		private String version;
+	/**
+	* 创建人
+	*/
+		@ApiModelProperty(value = "创建人")
+		private Long createUser;
+	/**
+	* 创建部门
+	*/
+		@ApiModelProperty(value = "创建部门")
+		private Long createDept;
+	/**
+	* 创建时间
+	*/
+		@ApiModelProperty(value = "创建时间")
+		private LocalDateTime createTime;
+	/**
+	* 修改人
+	*/
+		@ApiModelProperty(value = "修改人")
+		private Long updateUser;
+	/**
+	* 修改时间
+	*/
+		@ApiModelProperty(value = "修改时间")
+		private LocalDateTime updateTime;
+	/**
+	* 状态(0 正常 1停用)
+	*/
+		@ApiModelProperty(value = "状态(0 正常 1停用)")
+		private Integer status;
+	/**
+	* 是否已删除(0 否 1是)
+	*/
+		@ApiModelProperty(value = "是否已删除(0 否 1是)")
+		private Integer isDeleted;
+
+
+}

+ 138 - 0
blade-service/blade-client/src/main/java/org/springblade/client/entity/StorageType.java

@@ -0,0 +1,138 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 仓库实体类
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+@Data
+@TableName("basic_storage_type")
+@ApiModel(value = "StorageType对象", description = "仓库")
+public class StorageType implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 主键
+	*/
+		@ApiModelProperty(value = "主键")
+		private Long id;
+	/**
+	* 父主键
+	*/
+		@ApiModelProperty(value = "父主键")
+		private Long parentId;
+	/**
+	* 祖籍列表
+	*/
+		@ApiModelProperty(value = "祖籍列表")
+		private String ancestors;
+	/**
+	* 仓库编码
+	*/
+		@ApiModelProperty(value = "仓库编码")
+		private String code;
+	/**
+	* 仓库名称
+	*/
+		@ApiModelProperty(value = "仓库名称")
+		private String cname;
+	/**
+	* 地址
+	*/
+		@ApiModelProperty(value = "地址")
+		private String addr;
+	/**
+	* 联系人
+	*/
+		@ApiModelProperty(value = "联系人")
+		private String attn;
+	/**
+	* 电话
+	*/
+		@ApiModelProperty(value = "电话")
+		private String tel;
+	/**
+	* 库容
+	*/
+		@ApiModelProperty(value = "库容")
+		private BigDecimal storageCapacity;
+	/**
+	* 排序
+	*/
+		@ApiModelProperty(value = "排序")
+		private Long sort;
+	/**
+	* 备注
+	*/
+		@ApiModelProperty(value = "备注")
+		private String remarks;
+	/**
+	* 版本
+	*/
+		@ApiModelProperty(value = "版本")
+		private String version;
+	/**
+	* 创建人
+	*/
+		@ApiModelProperty(value = "创建人")
+		private Long createUser;
+	/**
+	* 创建部门
+	*/
+		@ApiModelProperty(value = "创建部门")
+		private Long createDept;
+	/**
+	* 创建时间
+	*/
+		@ApiModelProperty(value = "创建时间")
+		private LocalDateTime createTime;
+	/**
+	* 修改人
+	*/
+		@ApiModelProperty(value = "修改人")
+		private Long updateUser;
+	/**
+	* 修改时间
+	*/
+		@ApiModelProperty(value = "修改时间")
+		private LocalDateTime updateTime;
+	/**
+	* 状态(0 正常 1停用)
+	*/
+		@ApiModelProperty(value = "状态(0 正常 1停用)")
+		private Integer status;
+	/**
+	* 是否已删除(0 否 1是)
+	*/
+		@ApiModelProperty(value = "是否已删除(0 否 1是)")
+		private Integer isDeleted;
+
+
+}

+ 97 - 0
blade-service/blade-client/src/main/java/org/springblade/client/entity/StorageTypeDesc.java

@@ -0,0 +1,97 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 仓库-库区对应表实体类
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+@Data
+@TableName("basic_storage_type_desc")
+@ApiModel(value = "StorageTypeDesc对象", description = "仓库-库区对应表")
+public class StorageTypeDesc implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 主键
+	*/
+		@ApiModelProperty(value = "主键")
+		private Long id;
+	/**
+	* 仓库idid
+	*/
+		@ApiModelProperty(value = "仓库idid")
+		private Long storageTypeId;
+	/**
+	* 库区id
+	*/
+		@ApiModelProperty(value = "库区id")
+		private Long storageId;
+	/**
+	* 版本
+	*/
+		@ApiModelProperty(value = "版本")
+		private String version;
+	/**
+	* 创建人
+	*/
+		@ApiModelProperty(value = "创建人")
+		private Long createUser;
+	/**
+	* 创建部门
+	*/
+		@ApiModelProperty(value = "创建部门")
+		private Long createDept;
+	/**
+	* 创建时间
+	*/
+		@ApiModelProperty(value = "创建时间")
+		private LocalDateTime createTime;
+	/**
+	* 修改人
+	*/
+		@ApiModelProperty(value = "修改人")
+		private Long updateUser;
+	/**
+	* 修改时间
+	*/
+		@ApiModelProperty(value = "修改时间")
+		private LocalDateTime updateTime;
+	/**
+	* 状态(0 正常 1停用)
+	*/
+		@ApiModelProperty(value = "状态(0 正常 1停用)")
+		private Integer status;
+	/**
+	* 是否已删除(0 否 1是)
+	*/
+		@ApiModelProperty(value = "是否已删除(0 否 1是)")
+		private Integer isDeleted;
+
+
+}

+ 42 - 0
blade-service/blade-client/src/main/java/org/springblade/client/mapper/StorageDescMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.mapper;
+
+import org.springblade.client.entity.StorageDesc;
+import org.springblade.client.vo.StorageDescVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 库区表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+public interface StorageDescMapper extends BaseMapper<StorageDesc> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param storageDesc
+	 * @return
+	 */
+	List<StorageDescVO> selectStorageDescPage(IPage page, StorageDescVO storageDesc);
+
+}

+ 31 - 0
blade-service/blade-client/src/main/java/org/springblade/client/mapper/StorageDescMapper.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.client.mapper.StorageDescMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="storageDescResultMap" type="org.springblade.client.entity.StorageDesc">
+        <id column="id" property="id"/>
+        <result column="code" property="code"/>
+        <result column="cname" property="cname"/>
+        <result column="addr" property="addr"/>
+        <result column="attn" property="attn"/>
+        <result column="tel" property="tel"/>
+        <result column="iffee" property="iffee"/>
+        <result column="storage_capacity" property="storageCapacity"/>
+        <result column="remarks" property="remarks"/>
+        <result column="version" property="version"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+    </resultMap>
+
+
+    <select id="selectStorageDescPage" resultMap="storageDescResultMap">
+        select * from basic_storage_desc where is_deleted = 0
+    </select>
+
+</mapper>

+ 42 - 0
blade-service/blade-client/src/main/java/org/springblade/client/mapper/StorageTypeDescMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.mapper;
+
+import org.springblade.client.entity.StorageTypeDesc;
+import org.springblade.client.vo.StorageTypeDescVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 仓库-库区对应表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+public interface StorageTypeDescMapper extends BaseMapper<StorageTypeDesc> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param storageTypeDesc
+	 * @return
+	 */
+	List<StorageTypeDescVO> selectStorageTypeDescPage(IPage page, StorageTypeDescVO storageTypeDesc);
+
+}

+ 25 - 0
blade-service/blade-client/src/main/java/org/springblade/client/mapper/StorageTypeDescMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.client.mapper.StorageTypeDescMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="storageTypeDescResultMap" type="org.springblade.client.entity.StorageTypeDesc">
+        <id column="id" property="id"/>
+        <result column="storage_type_id" property="storageTypeId"/>
+        <result column="storage_id" property="storageId"/>
+        <result column="version" property="version"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+    </resultMap>
+
+
+    <select id="selectStorageTypeDescPage" resultMap="storageTypeDescResultMap">
+        select * from basic_storage_type_desc where is_deleted = 0
+    </select>
+
+</mapper>

+ 42 - 0
blade-service/blade-client/src/main/java/org/springblade/client/mapper/StorageTypeMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.mapper;
+
+import org.springblade.client.entity.StorageType;
+import org.springblade.client.vo.StorageTypeVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 仓库 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+public interface StorageTypeMapper extends BaseMapper<StorageType> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param storageType
+	 * @return
+	 */
+	List<StorageTypeVO> selectStorageTypePage(IPage page, StorageTypeVO storageType);
+
+}

+ 33 - 0
blade-service/blade-client/src/main/java/org/springblade/client/mapper/StorageTypeMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.client.mapper.StorageTypeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="storageTypeResultMap" type="org.springblade.client.entity.StorageType">
+        <id column="id" property="id"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="ancestors" property="ancestors"/>
+        <result column="code" property="code"/>
+        <result column="cname" property="cname"/>
+        <result column="addr" property="addr"/>
+        <result column="attn" property="attn"/>
+        <result column="tel" property="tel"/>
+        <result column="storage_capacity" property="storageCapacity"/>
+        <result column="sort" property="sort"/>
+        <result column="remarks" property="remarks"/>
+        <result column="version" property="version"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+    </resultMap>
+
+
+    <select id="selectStorageTypePage" resultMap="storageTypeResultMap">
+        select * from basic_storage_type where is_deleted = 0
+    </select>
+
+</mapper>

+ 41 - 0
blade-service/blade-client/src/main/java/org/springblade/client/service/IStorageDescService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.service;
+
+import org.springblade.client.entity.StorageDesc;
+import org.springblade.client.vo.StorageDescVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 库区表 服务类
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+public interface IStorageDescService extends IService<StorageDesc> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param storageDesc
+	 * @return
+	 */
+	IPage<StorageDescVO> selectStorageDescPage(IPage<StorageDescVO> page, StorageDescVO storageDesc);
+
+}

+ 41 - 0
blade-service/blade-client/src/main/java/org/springblade/client/service/IStorageTypeDescService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.service;
+
+import org.springblade.client.entity.StorageTypeDesc;
+import org.springblade.client.vo.StorageTypeDescVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 仓库-库区对应表 服务类
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+public interface IStorageTypeDescService extends IService<StorageTypeDesc> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param storageTypeDesc
+	 * @return
+	 */
+	IPage<StorageTypeDescVO> selectStorageTypeDescPage(IPage<StorageTypeDescVO> page, StorageTypeDescVO storageTypeDesc);
+
+}

+ 41 - 0
blade-service/blade-client/src/main/java/org/springblade/client/service/IStorageTypeService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.service;
+
+import org.springblade.client.entity.StorageType;
+import org.springblade.client.vo.StorageTypeVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 仓库 服务类
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+public interface IStorageTypeService extends IService<StorageType> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param storageType
+	 * @return
+	 */
+	IPage<StorageTypeVO> selectStorageTypePage(IPage<StorageTypeVO> page, StorageTypeVO storageType);
+
+}

+ 41 - 0
blade-service/blade-client/src/main/java/org/springblade/client/service/impl/StorageDescServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.service.impl;
+
+import org.springblade.client.entity.StorageDesc;
+import org.springblade.client.vo.StorageDescVO;
+import org.springblade.client.mapper.StorageDescMapper;
+import org.springblade.client.service.IStorageDescService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 库区表 服务实现类
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+@Service
+public class StorageDescServiceImpl extends ServiceImpl<StorageDescMapper, StorageDesc> implements IStorageDescService {
+
+	@Override
+	public IPage<StorageDescVO> selectStorageDescPage(IPage<StorageDescVO> page, StorageDescVO storageDesc) {
+		return page.setRecords(baseMapper.selectStorageDescPage(page, storageDesc));
+	}
+
+}

+ 41 - 0
blade-service/blade-client/src/main/java/org/springblade/client/service/impl/StorageTypeDescServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.service.impl;
+
+import org.springblade.client.entity.StorageTypeDesc;
+import org.springblade.client.vo.StorageTypeDescVO;
+import org.springblade.client.mapper.StorageTypeDescMapper;
+import org.springblade.client.service.IStorageTypeDescService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 仓库-库区对应表 服务实现类
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+@Service
+public class StorageTypeDescServiceImpl extends ServiceImpl<StorageTypeDescMapper, StorageTypeDesc> implements IStorageTypeDescService {
+
+	@Override
+	public IPage<StorageTypeDescVO> selectStorageTypeDescPage(IPage<StorageTypeDescVO> page, StorageTypeDescVO storageTypeDesc) {
+		return page.setRecords(baseMapper.selectStorageTypeDescPage(page, storageTypeDesc));
+	}
+
+}

+ 41 - 0
blade-service/blade-client/src/main/java/org/springblade/client/service/impl/StorageTypeServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.service.impl;
+
+import org.springblade.client.entity.StorageType;
+import org.springblade.client.vo.StorageTypeVO;
+import org.springblade.client.mapper.StorageTypeMapper;
+import org.springblade.client.service.IStorageTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 仓库 服务实现类
+ *
+ * @author BladeX
+ * @since 2021-09-22
+ */
+@Service
+public class StorageTypeServiceImpl extends ServiceImpl<StorageTypeMapper, StorageType> implements IStorageTypeService {
+
+	@Override
+	public IPage<StorageTypeVO> selectStorageTypePage(IPage<StorageTypeVO> page, StorageTypeVO storageType) {
+		return page.setRecords(baseMapper.selectStorageTypePage(page, storageType));
+	}
+
+}