From 60f51255fca3538ee188bdba723bc972b2f5e70a Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 26 六月 2024 18:08:34 +0800
Subject: [PATCH] 森林防火 的仓库管理和货架管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsShelfVO.java | 60 ++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsShelfDTO.java | 25 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlStoreManagementService.java | 13
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java | 52 ++-
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java | 58 ++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementQuery.java | 22 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementDTO.java | 73 +++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlStoreManagementImgService.java | 5
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsShelfQuery.java | 20 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GoodsShelfQuery.java | 18 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GoodsShelfDTO.java | 21 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsShelfService.java | 17 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java | 117 ++++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementimgQuery.java | 16 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlStoreManagementController.java | 49 +++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementimgDTO.java | 23 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java | 119 ++++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/QStoreManagementQuery.java | 24 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlStoreManagementImgController.java | 26 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementImgServiceImpl.java | 40 ++
21 files changed, 779 insertions(+), 21 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java
index 8d401be..ae97127 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java
@@ -1,9 +1,20 @@
package com.ruoyi.management.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.management.domain.SlGoodsShelf;
+import com.ruoyi.management.domain.SlStoreManagement;
+import com.ruoyi.management.domain.SlStoreManagementImg;
+import com.ruoyi.management.domain.dto.*;
+import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
+import com.ruoyi.management.service.SlGoodsShelfService;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -17,4 +28,47 @@
@RequestMapping("/sl-goods-shelf")
public class SlGoodsShelfController {
+ @Resource
+ private SlGoodsShelfService slGoodsShelfService;
+
+ @PostMapping("/getGoodsShelfList")
+ @ApiOperation(value = "分页获货架表管理")
+ public R<PageDTO<SlGoodsShelfVO>> getGoodsShelfList(@RequestBody SlGoodsShelfQuery slGoodsShelfQuery) {
+ return R.ok(slGoodsShelfService.getGoodsShelfList(slGoodsShelfQuery));
+ }
+
+ @PostMapping("/addSlGoodsShelf")
+ @ApiOperation(value = "添加/修改货架管理")
+ public R addSlGoodsShelf(@RequestBody SlGoodsShelfDTO slGoodsShelfDTO) {
+ slGoodsShelfService.addSlGoodsShelf(slGoodsShelfDTO);
+ return R.ok();
+ }
+
+ @ApiOperation("删除仓库管理")
+ @DeleteMapping("/{id}")
+ public R<?> delStoreManagement(
+ @ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Integer id) {
+ slGoodsShelfService.removeById(id);
+ return R.ok();
+ }
+
+ @PostMapping("/wfanzGoodsShelfList")
+ @ApiOperation(value = "货架获取未放置")
+ public R<List<SlGoodsShelf>> wfanzGoodsShelfList(@RequestBody GoodsShelfQuery goodsShelfQuery) {
+ return R.ok(slGoodsShelfService.wfanzGoodsShelfList(goodsShelfQuery));
+ }
+
+ @PostMapping("/fanzGoodsShelfList")
+ @ApiOperation(value = "货架放置到图片")
+ public R fanzGoodsShelfList(@RequestBody GoodsShelfDTO goodsShelfDTO) {
+ slGoodsShelfService.fanzGoodsShelfList(goodsShelfDTO);
+ return R.ok();
+ }
+
+ @PostMapping("/getStoreManagementimgSheif")
+ @ApiOperation(value = "獲取仓库管理平面圖的仓库")
+ public R<List<SlGoodsShelf>> getStoreManagementimgSheif(@RequestBody GoodsShelfDTO goodsShelfDTO) {
+ return R.ok(slGoodsShelfService.getStoreManagementimgSheif(goodsShelfDTO));
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlStoreManagementController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlStoreManagementController.java
index 4c8a92a..71697bd 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlStoreManagementController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlStoreManagementController.java
@@ -1,9 +1,19 @@
package com.ruoyi.management.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.management.domain.SlStoreManagement;
+import com.ruoyi.management.domain.dto.QStoreManagementQuery;
+import com.ruoyi.management.domain.dto.StoreManagementDTO;
+import com.ruoyi.management.domain.dto.StoreManagementQuery;
+import com.ruoyi.management.service.SlStoreManagementService;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -16,5 +26,40 @@
@RestController
@RequestMapping("/sl-store-management")
public class SlStoreManagementController {
+ @Resource
+ private SlStoreManagementService slStoreManagementService;
+
+ @PostMapping("/getStoreManagementList")
+ @ApiOperation(value = "分页获取仓库管理")
+ public R<PageDTO<SlStoreManagement>> getStoreManagementList(@RequestBody StoreManagementQuery storeManagementQuery) {
+ return R.ok(slStoreManagementService.getStoreManagementList(storeManagementQuery));
+ }
+
+ @PostMapping("/addStoreManagement")
+ @ApiOperation(value = "添加/修改仓库管理")
+ public R addStoreManagement(@RequestBody StoreManagementDTO storeManagementDTO) {
+ slStoreManagementService.addStoreManagement(storeManagementDTO);
+ return R.ok();
+ }
+
+ @ApiOperation("删除仓库管理")
+ @DeleteMapping("/{id}")
+ public R<?> delStoreManagement(
+ @ApiParam(name = "id", value = "仓库管理id", required = true) @PathVariable("id") Integer id) {
+ slStoreManagementService.removeById(id);
+ return R.ok();
+ }
+
+ @PostMapping("/getStoreManagementOne")
+ @ApiOperation(value = "仓库管理詳情")
+ public R<SlStoreManagement> getStoreManagementOne( @ApiParam(name = "id", value = "仓库管理id", required = true) @PathVariable("id") Integer id) {
+ return R.ok(slStoreManagementService.getById(id));
+ }
+
+ @PostMapping("/QueryStoreManagementList")
+ @ApiOperation(value = "根据条件仓库管理列表")
+ public R<List<SlStoreManagement>> QueryStoreManagementList(@RequestBody QStoreManagementQuery StoreManagementQuery) {
+ return R.ok(slStoreManagementService.QueryStoreManagementList(StoreManagementQuery));
+ }
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlStoreManagementImgController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlStoreManagementImgController.java
index 7dc450c..12f60c8 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlStoreManagementImgController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlStoreManagementImgController.java
@@ -1,9 +1,20 @@
package com.ruoyi.management.controller;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.management.domain.SlStoreManagementImg;
+import com.ruoyi.management.domain.dto.StoreManagementDTO;
+import com.ruoyi.management.domain.dto.StoreManagementimgDTO;
+import com.ruoyi.management.domain.dto.StoreManagementimgQuery;
+import com.ruoyi.management.service.SlStoreManagementImgService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -17,4 +28,19 @@
@RequestMapping("/sl-store-management-img")
public class SlStoreManagementImgController {
+ @Resource
+ private SlStoreManagementImgService slStoreManagementImgService;
+ @PostMapping("/addStoreManagementimg")
+ @ApiOperation(value = "添加/修改仓库管理平面圖")
+ public R addStoreManagementimg(@RequestBody StoreManagementimgDTO storeManagementimgDTO) {
+ slStoreManagementImgService.addStoreManagementimg(storeManagementimgDTO);
+ return R.ok();
+ }
+
+ @PostMapping("/getStoreManagementimgOne")
+ @ApiOperation(value = "獲取仓库管理平面圖")
+ public R<SlStoreManagementImg> getStoreManagementimgOne(@RequestBody StoreManagementimgQuery storeManagementimgQuery) {
+ return R.ok(slStoreManagementImgService.getStoreManagementimgOne(storeManagementimgQuery));
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java
index 6f9e8f1..61fe983 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java
@@ -7,7 +7,7 @@
/**
* <p>
- * 仓库管理 前端控制器
+ * 仓库出库管理 前端控制器
* </p>
*
* @author hjl
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java
index 915c4bf..916339b 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java
@@ -38,33 +38,53 @@
@TableField("store_management_number")
private Integer storeManagementNumber;
- @ApiModelProperty("仓库等级 1省级，2市州级，3市县级，5乡镇级，6 经营单位")
+ @ApiModelProperty("仓库等级 0全部 1省级，2市州级，3市县级，5乡镇级，6 经营单位")
@TableField("store_management_grade")
private Integer storeManagementGrade;
- @ApiModelProperty("所在市")
- @TableField("store_management_city")
- private String storeManagementCity;
+ /** 所属省名称 */
+ @TableField("province_name")
+ private String provinceName;
- @ApiModelProperty("所在县")
- @TableField("store_management_county")
- private String storeManagementCounty;
+ /** 所属省code */
+ @TableField("province_code")
+ private String provinceCode;
- @ApiModelProperty("所在乡")
- @TableField("store_management_village")
- private String storeManagementVillage;
+ /** 城市名称 */
+ @TableField("city_name")
+ private String cityName;
- @ApiModelProperty("主任id-仓库管理员选择的")
+ /** 城市code */
+ @TableField("city_code")
+ private String cityCode;
+
+ /** 所属区县名称 */
+ @TableField("county_name")
+ private String countyName;
+
+ /** 所属区县code */
+ @TableField("county_code")
+ private String countyCode;
+
+ /** 所属街道名称 */
+ @TableField("town_name")
+ private String townName;
+
+ /** 所属街道code */
+ @TableField("town_code")
+ private String townCode;
+
+ @ApiModelProperty("主任id-仓库管理员选择的多个逗号隔各开")
@TableField("director_id")
- private Integer directorId;
+ private String directorId;
- @ApiModelProperty("主管id-仓库管理员选择的")
+ @ApiModelProperty("主管id-仓库管理员选择的多个逗号隔各开")
@TableField("competent_id")
- private Integer competentId;
+ private String competentId;
- @ApiModelProperty("主管id")
+ @ApiModelProperty("管理员id多个逗号隔各开")
@TableField("administrator_id")
- private Integer administratorId;
+ private String administratorId;
@ApiModelProperty("仓库地址")
@TableField("store_management_adder")
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GoodsShelfDTO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GoodsShelfDTO.java
new file mode 100644
index 0000000..e3dda30
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GoodsShelfDTO.java
@@ -0,0 +1,21 @@
+package com.ruoyi.management.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("货物管理放置数据传输对象")
+public class GoodsShelfDTO {
+ private Integer id;
+
+ @ApiModelProperty("图片id")
+ private Integer imgId;
+
+ @ApiModelProperty("仓库在图片坐标X轴")
+ private String zbX;
+
+ @ApiModelProperty("仓库在图片坐标y轴")
+ private String zbY;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GoodsShelfQuery.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GoodsShelfQuery.java
new file mode 100644
index 0000000..15937cf
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GoodsShelfQuery.java
@@ -0,0 +1,18 @@
+package com.ruoyi.management.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("货架未放置查询传输对象")
+public class GoodsShelfQuery {
+ @ApiModelProperty("仓库id")
+ @TableField("store_management_id")
+ private Integer storeManagementId;
+
+ @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层")
+ @TableField("store_management_number")
+ private Integer storeManagementNumber;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/QStoreManagementQuery.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/QStoreManagementQuery.java
new file mode 100644
index 0000000..7eedd26
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/QStoreManagementQuery.java
@@ -0,0 +1,24 @@
+package com.ruoyi.management.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("仓库管理不分页根据条件数据查询传输对象")
+public class QStoreManagementQuery {
+ @ApiModelProperty("仓库等级 1省级，2市州级，3市县级，5乡镇级，6 经营单位")
+ private Integer storeManagementGrade;
+ /** 城市code */
+ @ApiModelProperty("城市code")
+ private String cityCode;
+ /** 所属区县code */
+ @ApiModelProperty("所属区县code")
+ private String countyCode;
+
+ /** 所属街道code */
+ @ApiModelProperty("所属街道code")
+ private String townCode;
+
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsShelfDTO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsShelfDTO.java
new file mode 100644
index 0000000..618bb35
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsShelfDTO.java
@@ -0,0 +1,25 @@
+package com.ruoyi.management.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("货物管理数据传输对象")
+public class SlGoodsShelfDTO {
+
+ private Integer id;
+
+ @ApiModelProperty("货架名称")
+ private String goodsShelfName;
+
+ @ApiModelProperty("仓库id")
+ private Integer storeManagementId;
+
+ @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层")
+ private Integer storeManagementNumber;
+
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsShelfQuery.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsShelfQuery.java
new file mode 100644
index 0000000..94f1119
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsShelfQuery.java
@@ -0,0 +1,20 @@
+package com.ruoyi.management.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("货架数据查询传输对象")
+public class SlGoodsShelfQuery extends BasePage {
+ @ApiModelProperty("仓库名称")
+ private String storeManagementName;
+
+ @ApiModelProperty("货架名称")
+ private String goodsShelfName;
+
+ @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层")
+ private Integer storeManagementNumber;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementDTO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementDTO.java
new file mode 100644
index 0000000..b532f00
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementDTO.java
@@ -0,0 +1,73 @@
+package com.ruoyi.management.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("仓库管理数据传输对象")
+public class StoreManagementDTO {
+ @TableId("id")
+ private Integer id;
+
+ @ApiModelProperty("仓库名称")
+ private String storeManagementName;
+
+ @ApiModelProperty("仓库编号")
+ private String storeManagementNo;
+
+ @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层")
+ private Integer storeManagementNumber;
+
+ @ApiModelProperty("仓库等级 1省级，2市州级，3市县级，5乡镇级，6 经营单位")
+ private Integer storeManagementGrade;
+
+ /** 所属省名称 */
+ @ApiModelProperty("所属省名称")
+ private String provinceName;
+
+ /** 所属省code */
+ @ApiModelProperty("所属省code")
+ private String provinceCode;
+
+ /** 城市名称 */
+ @ApiModelProperty("城市名称")
+ private String cityName;
+
+ /** 城市code */
+ @ApiModelProperty("城市code")
+ private String cityCode;
+
+ /** 所属区县名称 */
+ @ApiModelProperty("所属区县名称")
+ private String countyName;
+
+ /** 所属区县code */
+ @ApiModelProperty("所属区县code")
+ private String countyCode;
+
+ /** 所属街道名称 */
+ @ApiModelProperty("所属街道名称")
+ private String townName;
+
+ /** 所属街道code */
+ @ApiModelProperty("所属街道code")
+ private String townCode;
+
+ @ApiModelProperty("主任id-仓库管理员选择的多个逗号隔各开")
+ private String directorId;
+
+ @ApiModelProperty("主管id-仓库管理员选择的多个逗号隔各开")
+ private String competentId;
+
+ @ApiModelProperty("管理员id多个逗号隔各开")
+ private String administratorId;
+
+ @ApiModelProperty("仓库地址")
+ private String storeManagementAdder;
+
+ @ApiModelProperty("仓库说明")
+ private String storeManagementExplain;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementQuery.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementQuery.java
new file mode 100644
index 0000000..b3753a0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementQuery.java
@@ -0,0 +1,22 @@
+package com.ruoyi.management.domain.dto;
+
+import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("仓库管理分页数据查询传输对象")
+public class StoreManagementQuery extends BasePage {
+ @ApiModelProperty("仓库名称")
+ private String storeManagementName;
+
+ @ApiModelProperty("仓库编号")
+ private String storeManagementNo;
+
+ @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层")
+ private Integer storeManagementNumber;
+
+ @ApiModelProperty("仓库等级 1省级，2市州级，3市县级，5乡镇级，6 经营单位")
+ private Integer storeManagementGrade;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementimgDTO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementimgDTO.java
new file mode 100644
index 0000000..faf12c7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementimgDTO.java
@@ -0,0 +1,23 @@
+package com.ruoyi.management.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("仓库对应平面图数据传输对象")
+public class StoreManagementimgDTO {
+ @TableId("id")
+ private Integer id;
+
+ @ApiModelProperty("图片路径")
+ private String imgUrl;
+
+ @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层")
+ private Integer storeManagementNumber;
+
+ @ApiModelProperty("仓库id")
+ private Integer storeManagementId;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementimgQuery.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementimgQuery.java
new file mode 100644
index 0000000..a5627d5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementimgQuery.java
@@ -0,0 +1,16 @@
+package com.ruoyi.management.domain.dto;
+
+import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("仓库对应平面图数据查询传输对象")
+public class StoreManagementimgQuery extends BasePage {
+ @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层")
+ private Integer storeManagementNumber;
+
+ @ApiModelProperty("仓库id")
+ private Integer storeManagementId;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsShelfVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsShelfVO.java
new file mode 100644
index 0000000..d2e86dd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsShelfVO.java
@@ -0,0 +1,60 @@
+package com.ruoyi.management.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "货架视图对象", description = "货架视图对象")
+public class SlGoodsShelfVO {
+ @ApiModelProperty("数据id")
+ private Integer id;
+
+ @ApiModelProperty("仓库id")
+ private Integer storeManagementId;
+
+ @ApiModelProperty("仓库名称")
+ private String storeManagementName;
+
+ @ApiModelProperty("货架名称")
+ @TableField("goods_shelf_name")
+ private String goodsShelfName;
+
+ @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层")
+ private Integer storeManagementNumber;
+
+ /** 所属省名称 */
+ @ApiModelProperty("所属省名称")
+ private String provinceName;
+
+ /** 所属省code */
+ @ApiModelProperty("所属省code")
+ private String provinceCode;
+
+ /** 城市名称 */
+ @ApiModelProperty("城市名称")
+ private String cityName;
+
+ /** 城市code */
+ @ApiModelProperty("城市code")
+ private String cityCode;
+
+ /** 所属区县名称 */
+ @ApiModelProperty("所属区县名称")
+ private String countyName;
+
+ /** 所属区县code */
+ @ApiModelProperty("所属区县code")
+ private String countyCode;
+
+ /** 所属街道名称 */
+ @ApiModelProperty("所属街道名称")
+ private String townName;
+
+ /** 所属街道code */
+ @ApiModelProperty("所属街道code")
+ private String townCode;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsShelfService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsShelfService.java
index 46716f9..1644276 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsShelfService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsShelfService.java
@@ -1,7 +1,16 @@
package com.ruoyi.management.service;
+import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlGoodsShelf;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.management.domain.dto.GoodsShelfDTO;
+import com.ruoyi.management.domain.dto.GoodsShelfQuery;
+import com.ruoyi.management.domain.dto.SlGoodsShelfDTO;
+import com.ruoyi.management.domain.dto.SlGoodsShelfQuery;
+import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
/**
* <p>
@@ -12,5 +21,13 @@
* @since 2024-06-25
*/
public interface SlGoodsShelfService extends IService<SlGoodsShelf> {
+ PageDTO<SlGoodsShelfVO> getGoodsShelfList(@RequestBody SlGoodsShelfQuery slGoodsShelfQuery);
+ void addSlGoodsShelf(@RequestBody SlGoodsShelfDTO slGoodsShelfDTO);
+
+ List<SlGoodsShelf> wfanzGoodsShelfList(@RequestBody GoodsShelfQuery goodsShelfQuery);
+
+ void fanzGoodsShelfList(@RequestBody GoodsShelfDTO goodsShelfDTO);
+
+ List<SlGoodsShelf> getStoreManagementimgSheif(@RequestBody GoodsShelfDTO goodsShelfDTO);
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlStoreManagementImgService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlStoreManagementImgService.java
index 7e50c2c..8ac43bd 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlStoreManagementImgService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlStoreManagementImgService.java
@@ -2,6 +2,9 @@
import com.ruoyi.management.domain.SlStoreManagementImg;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.management.domain.dto.StoreManagementimgDTO;
+import com.ruoyi.management.domain.dto.StoreManagementimgQuery;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* <p>
@@ -12,5 +15,7 @@
* @since 2024-06-25
*/
public interface SlStoreManagementImgService extends IService<SlStoreManagementImg> {
+ void addStoreManagementimg(@RequestBody StoreManagementimgDTO storeManagementimgDTO);
+ SlStoreManagementImg getStoreManagementimgOne(@RequestBody StoreManagementimgQuery storeManagementimgQuery);
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlStoreManagementService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlStoreManagementService.java
index 25867fc..384d4be 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlStoreManagementService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlStoreManagementService.java
@@ -1,7 +1,14 @@
package com.ruoyi.management.service;
+import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlStoreManagement;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.management.domain.dto.QStoreManagementQuery;
+import com.ruoyi.management.domain.dto.StoreManagementDTO;
+import com.ruoyi.management.domain.dto.StoreManagementQuery;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +20,10 @@
*/
public interface SlStoreManagementService extends IService<SlStoreManagement> {
+ PageDTO<SlStoreManagement> getStoreManagementList(StoreManagementQuery storeManagementQuery);
+
+ void addStoreManagement(StoreManagementDTO storeManagementDTO);
+
+ List<SlStoreManagement> QueryStoreManagementList(@RequestBody QStoreManagementQuery StoreManagementQuery);
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
index 3bce630..687910e 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
@@ -1,10 +1,26 @@
package com.ruoyi.management.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlGoodsShelf;
+import com.ruoyi.management.domain.SlStoreManagement;
+import com.ruoyi.management.domain.dto.GoodsShelfDTO;
+import com.ruoyi.management.domain.dto.GoodsShelfQuery;
+import com.ruoyi.management.domain.dto.SlGoodsShelfDTO;
+import com.ruoyi.management.domain.dto.SlGoodsShelfQuery;
+import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
import com.ruoyi.management.mapper.SlGoodsShelfMapper;
import com.ruoyi.management.service.SlGoodsShelfService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.management.service.SlStoreManagementService;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* <p>
@@ -17,4 +33,107 @@
@Service
public class SlGoodsShelfServiceImpl extends ServiceImpl<SlGoodsShelfMapper, SlGoodsShelf> implements SlGoodsShelfService {
+ @Resource
+ private SlStoreManagementService SlStoreManagementService;
+ @Override
+ public PageDTO<SlGoodsShelfVO> getGoodsShelfList(SlGoodsShelfQuery slGoodsShelfQuery) {
+
+ LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName());
+ if (slGoodsShelfQuery.getStoreManagementNumber()!=0 && slGoodsShelfQuery.getStoreManagementNumber()!=null){
+ wrapper.eq(SlStoreManagement::getStoreManagementGrade,slGoodsShelfQuery.getStoreManagementNumber());
+ }
+ wrapper.eq(SlStoreManagement::getDelFlag,0);
+ List<SlStoreManagement> page1 = SlStoreManagementService.list(wrapper);
+ Set<Integer> slStoreManagementIdList = null;
+ slStoreManagementIdList = page1.stream().map(SlStoreManagement::getId)
+ .collect(Collectors.toSet());
+
+
+ Page<SlGoodsShelf> page = new Page<>(slGoodsShelfQuery.getPageCurr(), slGoodsShelfQuery.getPageSize());
+ LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.like(SlGoodsShelf::getGoodsShelfName,slGoodsShelfQuery.getGoodsShelfName());
+ if (slStoreManagementIdList.size()>0){
+ wrapper1.in(SlGoodsShelf::getStoreManagementId,slStoreManagementIdList);
+ }
+ wrapper1.eq( SlGoodsShelf::getDelFlag,0);
+ wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
+ Page<SlGoodsShelf> page2 = this.page(page, wrapper1);
+
+ PageDTO<SlGoodsShelfVO> SlGoodsShelfDTO = PageDTO.of(page2, SlGoodsShelfVO.class);
+ List<SlGoodsShelfVO> list2 = SlGoodsShelfDTO.getList();
+ for(SlGoodsShelfVO list:list2){
+ SlStoreManagement byId = SlStoreManagementService.getById(list.getStoreManagementId());
+ if (byId!=null){
+ list.setStoreManagementName(byId.getStoreManagementName());
+ list.setStoreManagementNumber(byId.getStoreManagementNumber());
+ list.setProvinceName(byId.getProvinceName());
+ list.setProvinceCode(byId.getProvinceCode());
+ list.setCityName(byId.getCityName());
+ list.setCityCode(byId.getCityCode());
+ list.setCountyName(byId.getCountyName());
+ list.setCountyCode(byId.getCountyCode());
+ list.setTownCode(byId.getTownCode());
+ list.setTownName(byId.getTownName());
+ }
+ }
+ return SlGoodsShelfDTO;
+
+ }
+
+ @Override
+ public void addSlGoodsShelf(SlGoodsShelfDTO slGoodsShelfDTO) {
+ if (slGoodsShelfDTO.getId()==null){
+ SlGoodsShelf slGoodsShelf=new SlGoodsShelf();
+ slGoodsShelf.setGoodsShelfName(slGoodsShelfDTO.getGoodsShelfName());
+ slGoodsShelf.setStoreManagementId(slGoodsShelfDTO.getStoreManagementId());
+ slGoodsShelf.setStoreManagementNumber(slGoodsShelfDTO.getStoreManagementNumber());
+ this.save(slGoodsShelf);
+ }else{
+ SlGoodsShelf slGoodsShelf = this.getById(slGoodsShelfDTO.getId());
+ if (slGoodsShelfDTO.getGoodsShelfName()!=null){
+ slGoodsShelf.setGoodsShelfName(slGoodsShelfDTO.getGoodsShelfName());
+ }
+ if (slGoodsShelfDTO.getStoreManagementNumber()!=null){
+ slGoodsShelf.setStoreManagementNumber(slGoodsShelfDTO.getStoreManagementNumber());
+ }
+ if (slGoodsShelfDTO.getGoodsShelfName()!=null){
+ slGoodsShelf.setStoreManagementNumber(slGoodsShelfDTO.getStoreManagementNumber());
+ }
+ this.updateById(slGoodsShelf);
+ }
+ }
+
+ @Override
+ public List<SlGoodsShelf> wfanzGoodsShelfList(GoodsShelfQuery goodsShelfQuery) {
+ LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(SlGoodsShelf::getStoreManagementId,goodsShelfQuery.getStoreManagementId());
+ wrapper1.eq(SlGoodsShelf::getStoreManagementNumber,goodsShelfQuery.getStoreManagementNumber());
+ wrapper1.eq(SlGoodsShelf::getIsStoreManagement,1);
+ wrapper1.eq( SlGoodsShelf::getDelFlag,0);
+ wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
+ List<SlGoodsShelf> page2 = this.list(wrapper1);
+ return page2;
+ }
+
+ @Override
+ public void fanzGoodsShelfList(GoodsShelfDTO goodsShelfDTO) {
+ SlGoodsShelf slGoodsShelf = this.getById(goodsShelfDTO.getId());
+ slGoodsShelf.setImgId(goodsShelfDTO.getImgId());
+ slGoodsShelf.setIsStoreManagement(2);
+ slGoodsShelf.setZbX(goodsShelfDTO.getZbX());
+ slGoodsShelf.setZbY(goodsShelfDTO.getZbY());
+ this.updateById(slGoodsShelf);
+ }
+
+ @Override
+ public List<SlGoodsShelf> getStoreManagementimgSheif(GoodsShelfDTO goodsShelfDTO) {
+ LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(SlGoodsShelf::getImgId,goodsShelfDTO.getImgId());
+ wrapper1.eq(SlGoodsShelf::getIsStoreManagement,2);
+ wrapper1.eq( SlGoodsShelf::getDelFlag,0);
+ wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
+ List<SlGoodsShelf> page2 = this.list(wrapper1);
+ return page2;
+ }
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementImgServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementImgServiceImpl.java
index 359d64e..4e17b2f 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementImgServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementImgServiceImpl.java
@@ -1,6 +1,13 @@
package com.ruoyi.management.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.management.domain.SlStoreManagement;
import com.ruoyi.management.domain.SlStoreManagementImg;
+import com.ruoyi.management.domain.dto.StoreManagementimgDTO;
+import com.ruoyi.management.domain.dto.StoreManagementimgQuery;
import com.ruoyi.management.mapper.SlStoreManagementImgMapper;
import com.ruoyi.management.service.SlStoreManagementImgService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -17,4 +24,37 @@
@Service
public class SlStoreManagementImgServiceImpl extends ServiceImpl<SlStoreManagementImgMapper, SlStoreManagementImg> implements SlStoreManagementImgService {
+ @Override
+ public void addStoreManagementimg(StoreManagementimgDTO storeManagementimgDTO) {
+ if (storeManagementimgDTO.getId()==null){
+ SlStoreManagementImg slStoreManagementImg=new SlStoreManagementImg();
+ slStoreManagementImg.setStoreManagementId(storeManagementimgDTO.getStoreManagementId());
+ slStoreManagementImg.setStoreManagementNumber(storeManagementimgDTO.getStoreManagementNumber());
+ slStoreManagementImg.setImgUrl(storeManagementimgDTO.getImgUrl());
+ this.save(slStoreManagementImg);
+ }else {
+ SlStoreManagementImg slStoreManagementImg = this.getById(storeManagementimgDTO.getId());
+ if (storeManagementimgDTO.getStoreManagementId()!=null){
+ slStoreManagementImg.setStoreManagementId(storeManagementimgDTO.getStoreManagementId());
+ }
+ if (storeManagementimgDTO.getStoreManagementNumber()!=null){
+ slStoreManagementImg.setStoreManagementNumber(storeManagementimgDTO.getStoreManagementNumber());
+ }
+ if (storeManagementimgDTO.getImgUrl()!=null){
+ slStoreManagementImg.setImgUrl(storeManagementimgDTO.getImgUrl());
+ }
+ this.updateById(slStoreManagementImg);
+ }
+ }
+
+ @Override
+ public SlStoreManagementImg getStoreManagementimgOne(StoreManagementimgQuery storeManagementimgQuery) {
+ LambdaQueryWrapper< SlStoreManagementImg> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(SlStoreManagementImg::getStoreManagementId,storeManagementimgQuery.getStoreManagementId());
+ wrapper.eq(SlStoreManagementImg::getStoreManagementNumber,storeManagementimgQuery.getStoreManagementNumber());
+ wrapper.eq( SlStoreManagementImg::getDelFlag,0);
+ wrapper.orderByDesc(SlStoreManagementImg::getCreateTime);
+ SlStoreManagementImg page1 = this.getOne(wrapper);
+ return page1;
+ }
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java
index 8cd6db1..a92150a 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java
@@ -1,12 +1,21 @@
package com.ruoyi.management.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlStoreManagement;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.management.domain.dto.QStoreManagementQuery;
+import com.ruoyi.management.domain.dto.StoreManagementDTO;
+import com.ruoyi.management.domain.dto.StoreManagementQuery;
import com.ruoyi.management.mapper.SlStoreManagementMapper;
import com.ruoyi.management.service.SlStoreManagementService;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -19,4 +28,112 @@
@Service
public class SlStoreManagementServiceImpl extends ServiceImpl<SlStoreManagementMapper, SlStoreManagement> implements SlStoreManagementService {
+ @Override
+ public PageDTO<SlStoreManagement> getStoreManagementList(StoreManagementQuery storeManagementQuery) {
+ Page<SlStoreManagement> page = new Page<>(storeManagementQuery.getPageCurr(), storeManagementQuery.getPageSize());
+ LambdaQueryWrapper< SlStoreManagement> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(SlStoreManagement::getStoreManagementName,storeManagementQuery.getStoreManagementName());
+ wrapper.eq(SlStoreManagement::getStoreManagementNo,storeManagementQuery.getStoreManagementNo());
+ if (storeManagementQuery.getStoreManagementGrade()!=0 && storeManagementQuery.getStoreManagementGrade()!=null){
+ wrapper.eq(SlStoreManagement::getStoreManagementGrade,storeManagementQuery.getStoreManagementGrade());
+ }
+ wrapper.eq( SlStoreManagement::getDelFlag,0);
+ wrapper.orderByDesc(SlStoreManagement::getCreateTime);
+ Page<SlStoreManagement> page1 = this.page(page, wrapper);
+ return PageDTO.of(page1);
+ }
+
+ @Override
+ public void addStoreManagement(StoreManagementDTO storeManagementDTO) {
+ if (storeManagementDTO.getId()==null){
+ SlStoreManagement slStoreManagement=new SlStoreManagement();
+ slStoreManagement.setStoreManagementNo(storeManagementDTO.getStoreManagementNo());
+ slStoreManagement.setStoreManagementAdder(storeManagementDTO.getStoreManagementAdder());
+ slStoreManagement.setStoreManagementExplain(storeManagementDTO.getStoreManagementExplain());
+ slStoreManagement.setStoreManagementName(storeManagementDTO.getStoreManagementName());
+ slStoreManagement.setStoreManagementGrade(storeManagementDTO.getStoreManagementGrade());
+ slStoreManagement.setStoreManagementNumber(storeManagementDTO.getStoreManagementNumber());
+ slStoreManagement.setAdministratorId(storeManagementDTO.getAdministratorId());
+ slStoreManagement.setCompetentId(storeManagementDTO.getCompetentId());
+ slStoreManagement.setDirectorId(storeManagementDTO.getDirectorId());
+ slStoreManagement.setProvinceName(storeManagementDTO.getProvinceName());
+ slStoreManagement.setProvinceCode(storeManagementDTO.getProvinceCode());
+ slStoreManagement.setCityName(storeManagementDTO.getCityName());
+ slStoreManagement.setCityCode(storeManagementDTO.getCityCode());
+ slStoreManagement.setCountyName(storeManagementDTO.getCountyName());
+ slStoreManagement.setCountyCode(storeManagementDTO.getCountyCode());
+ slStoreManagement.setTownCode(storeManagementDTO.getTownCode());
+ slStoreManagement.setTownName(storeManagementDTO.getTownName());
+ this.save(slStoreManagement);
+ }else {
+ SlStoreManagement slStoreManagement = this.getById(storeManagementDTO.getId());
+ if (storeManagementDTO.getStoreManagementNo()!=null){
+ slStoreManagement.setStoreManagementNo(storeManagementDTO.getStoreManagementNo());
+ }
+ if (storeManagementDTO.getStoreManagementAdder()!=null){
+ slStoreManagement.setStoreManagementAdder(storeManagementDTO.getStoreManagementAdder());
+ }
+ if (storeManagementDTO.getStoreManagementExplain()!=null){
+ slStoreManagement.setStoreManagementExplain(storeManagementDTO.getStoreManagementExplain());
+ }
+ if (storeManagementDTO.getStoreManagementName()!=null){
+ slStoreManagement.setStoreManagementName(storeManagementDTO.getStoreManagementName());
+ }
+ if (storeManagementDTO.getStoreManagementGrade()!=null){
+ slStoreManagement.setStoreManagementGrade(storeManagementDTO.getStoreManagementGrade());
+ }
+ if (storeManagementDTO.getStoreManagementNumber()!=null){
+ slStoreManagement.setStoreManagementNumber(storeManagementDTO.getStoreManagementNumber());
+ }
+ if (storeManagementDTO.getAdministratorId()!=null){
+ slStoreManagement.setAdministratorId(storeManagementDTO.getAdministratorId());
+ }
+ if (storeManagementDTO.getCompetentId()!=null){
+ slStoreManagement.setCompetentId(storeManagementDTO.getCompetentId());
+ }
+ if (storeManagementDTO.getDirectorId()!=null){
+ slStoreManagement.setDirectorId(storeManagementDTO.getDirectorId());
+ }
+ if (storeManagementDTO.getProvinceName()!=null){
+ slStoreManagement.setProvinceName(storeManagementDTO.getProvinceName());
+ }
+ if (storeManagementDTO.getProvinceCode()!=null){
+ slStoreManagement.setProvinceCode(storeManagementDTO.getProvinceCode());
+ }
+ if (storeManagementDTO.getCityName()!=null){
+ slStoreManagement.setCityName(storeManagementDTO.getCityName());
+ }
+ if (storeManagementDTO.getCityCode()!=null){
+ slStoreManagement.setCityCode(storeManagementDTO.getCityCode());
+ }
+ if (storeManagementDTO.getCountyName()!=null){
+ slStoreManagement.setCountyName(storeManagementDTO.getCountyName());
+ }
+ if (storeManagementDTO.getCountyCode()!=null){
+ slStoreManagement.setCountyCode(storeManagementDTO.getCountyCode());
+ }
+ if (storeManagementDTO.getTownCode()!=null){
+ slStoreManagement.setTownCode(storeManagementDTO.getTownCode());
+ }
+ if (storeManagementDTO.getTownName()!=null){
+ slStoreManagement.setTownName(storeManagementDTO.getTownName());
+ }
+ this.updateById(slStoreManagement);
+ }
+
+ }
+
+ @Override
+ public List<SlStoreManagement> QueryStoreManagementList(QStoreManagementQuery StoreManagementQuery) {
+ LambdaQueryWrapper< SlStoreManagement> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(SlStoreManagement::getCityCode,StoreManagementQuery.getCityCode());
+ wrapper.eq(SlStoreManagement::getCountyCode,StoreManagementQuery.getCountyCode());
+ if (StoreManagementQuery.getStoreManagementGrade()!=0 && StoreManagementQuery.getStoreManagementGrade()!=null){
+ wrapper.eq(SlStoreManagement::getStoreManagementGrade,StoreManagementQuery.getStoreManagementGrade());
+ }
+ wrapper.eq( SlStoreManagement::getDelFlag,0);
+ wrapper.orderByDesc(SlStoreManagement::getCreateTime);
+ List<SlStoreManagement> page1 = this.list(wrapper);
+ return page1;
+ }
}
--
Gitblit v1.7.1