From 24cf77f1cc07ced960081c816889b6c70c7bf4f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=87=E5=AE=BD=20=E5=8F=B2?= Date: Fri, 31 May 2024 15:59:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=A8=A1=E5=9D=97=E5=88=9B?= =?UTF-8?q?=E5=BB=BA,=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WarehouseController.java | 26 ++++++++++ .../warehouse/dao/WarehouseMapper.java | 9 ++++ .../modules/warehouse/entity/Location.java | 27 +++++++++++ .../modules/warehouse/entity/WareHouse.java | 41 ++++++++++++++++ .../service/Impl/WarehouseServiceImpl.java | 48 +++++++++++++++++++ .../warehouse/service/WarehouseService.java | 13 +++++ 6 files changed, 164 insertions(+) create mode 100644 src/main/java/com/spring/modules/warehouse/controller/WarehouseController.java create mode 100644 src/main/java/com/spring/modules/warehouse/dao/WarehouseMapper.java create mode 100644 src/main/java/com/spring/modules/warehouse/entity/Location.java create mode 100644 src/main/java/com/spring/modules/warehouse/entity/WareHouse.java create mode 100644 src/main/java/com/spring/modules/warehouse/service/Impl/WarehouseServiceImpl.java create mode 100644 src/main/java/com/spring/modules/warehouse/service/WarehouseService.java diff --git a/src/main/java/com/spring/modules/warehouse/controller/WarehouseController.java b/src/main/java/com/spring/modules/warehouse/controller/WarehouseController.java new file mode 100644 index 0000000..de05eb7 --- /dev/null +++ b/src/main/java/com/spring/modules/warehouse/controller/WarehouseController.java @@ -0,0 +1,26 @@ +package com.spring.modules.warehouse.controller; + +import com.spring.common.utils.PageUtils; +import com.spring.common.utils.R; +import com.spring.modules.warehouse.entity.WareHouse; +import com.spring.modules.warehouse.service.WarehouseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/warehouse") +public class WarehouseController { + @Autowired + private WarehouseService warehouseService; + + /** + * 查询 + * @param wareHouse + * @return + */ + @GetMapping("/findMessage") + public R findMessage(@RequestBody WareHouse wareHouse){ + PageUtils page=warehouseService.getInfo(wareHouse); + return R.ok().put("page",page); + } +} diff --git a/src/main/java/com/spring/modules/warehouse/dao/WarehouseMapper.java b/src/main/java/com/spring/modules/warehouse/dao/WarehouseMapper.java new file mode 100644 index 0000000..ba6339a --- /dev/null +++ b/src/main/java/com/spring/modules/warehouse/dao/WarehouseMapper.java @@ -0,0 +1,9 @@ +package com.spring.modules.warehouse.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.spring.modules.warehouse.entity.WareHouse; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface WarehouseMapper extends BaseMapper { +} diff --git a/src/main/java/com/spring/modules/warehouse/entity/Location.java b/src/main/java/com/spring/modules/warehouse/entity/Location.java new file mode 100644 index 0000000..59c1ac7 --- /dev/null +++ b/src/main/java/com/spring/modules/warehouse/entity/Location.java @@ -0,0 +1,27 @@ +package com.spring.modules.warehouse.entity; + +import com.spring.common.utils.QueryPage; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class Location extends QueryPage implements Serializable { + //库位编码 + private String locationId; + + //工厂编号 + private String site; + + //库位名称 + private String locationName; + + //仓位编码 + private String warehouseId; + + //保管员 + private String keeper; + + //是否在用:"0":是 "1":否 + private String active; +} \ No newline at end of file diff --git a/src/main/java/com/spring/modules/warehouse/entity/WareHouse.java b/src/main/java/com/spring/modules/warehouse/entity/WareHouse.java new file mode 100644 index 0000000..243b6ad --- /dev/null +++ b/src/main/java/com/spring/modules/warehouse/entity/WareHouse.java @@ -0,0 +1,41 @@ +package com.spring.modules.warehouse.entity; + +import com.spring.common.utils.QueryPage; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class WareHouse extends QueryPage implements Serializable { + //自增id + private Integer id; + + //工厂编码 + private String site; + + //仓库编码 + private String warehouseId; + + //仓库名称 + private String warehouseName; + + //是否在使用:"0":在使用 "1":未使用 + private String active; + + //仓库类型 + private String warehouseType; + + //仓库类型 + private String warehouseTypeDB; + + //管理员 + private String keeper; + //公司编码 + private String companyId; + + //是否有效仓库: "0" 是 "1":否 + private String validStock; + + //是否采用库位管理 + private String useLocation; +} diff --git a/src/main/java/com/spring/modules/warehouse/service/Impl/WarehouseServiceImpl.java b/src/main/java/com/spring/modules/warehouse/service/Impl/WarehouseServiceImpl.java new file mode 100644 index 0000000..09194c6 --- /dev/null +++ b/src/main/java/com/spring/modules/warehouse/service/Impl/WarehouseServiceImpl.java @@ -0,0 +1,48 @@ +package com.spring.modules.warehouse.service.Impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.spring.common.utils.PageUtils; +import com.spring.modules.warehouse.dao.WarehouseMapper; +import com.spring.modules.warehouse.entity.WareHouse; +import com.spring.modules.warehouse.service.WarehouseService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +@Slf4j +public class WarehouseServiceImpl extends ServiceImpl implements WarehouseService { + + @Autowired + private WarehouseMapper warehouseMapper; + + @Override + public PageUtils getInfo(WareHouse wareHouse) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + //根据条件查询 + //仓库编码 + if (StringUtils.isNotEmpty(wareHouse.getWarehouseId())){ + queryWrapper.eq(WareHouse::getWarehouseId,wareHouse.getWarehouseId()); + } + //工程编号 + if (StringUtils.isNotEmpty(wareHouse.getSite())){ + queryWrapper.eq(WareHouse::getSite,wareHouse.getSite()); + } + //仓库名称 + if (StringUtils.isNotEmpty(wareHouse.getWarehouseName())){ + queryWrapper.eq(WareHouse::getWarehouseName,wareHouse.getWarehouseName()); + } + //保管员 + if (StringUtils.isNotEmpty(wareHouse.getKeeper())){ + queryWrapper.eq(WareHouse::getKeeper,wareHouse.getKeeper()); + } + queryWrapper.orderByAsc(WareHouse::getId); + IPage page = this.page(new Page<>(wareHouse.getPage(),wareHouse.getLimit()), queryWrapper); + + return new PageUtils(page); + } +} diff --git a/src/main/java/com/spring/modules/warehouse/service/WarehouseService.java b/src/main/java/com/spring/modules/warehouse/service/WarehouseService.java new file mode 100644 index 0000000..4c585bf --- /dev/null +++ b/src/main/java/com/spring/modules/warehouse/service/WarehouseService.java @@ -0,0 +1,13 @@ +package com.spring.modules.warehouse.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.spring.common.utils.PageUtils; +import com.spring.modules.warehouse.entity.WareHouse; + +public interface WarehouseService extends IService { + + //查询 + PageUtils getInfo(WareHouse wareHouse); + +}