仓库,库位curd

src/main/java/com/spring/modules/warehouse/controller/WarehouseController.java

@@ -2,13 +2,13 @@ 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.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")
+@RequestMapping("/warehouse/info")
 public class WarehouseController {
     @Autowired
     private WarehouseService warehouseService;
@@ -18,8 +18,8 @@ public class WarehouseController {
      * @param wareHouse 库区
      * @return
      */
-    @GetMapping("/findMessage")
-    public R findMessage(@RequestBody WareHouse wareHouse){
+    @PostMapping("/findMessage")
+    public R findMessage(@RequestBody Warehouse wareHouse){
         PageUtils page=warehouseService.getInfo(wareHouse);
         return R.ok().put("page",page);
     }
@@ -29,7 +29,7 @@ public class WarehouseController {
      * @return
      */
     @PostMapping("/append")
-    public R append(@RequestBody WareHouse wareHouse){
+    public R append(@RequestBody Warehouse wareHouse){
         warehouseService.saveByInfo(wareHouse);
         return R.ok("新增成功");
     }
@@ -39,12 +39,12 @@ public class WarehouseController {
      * @return
      */
     @PostMapping("/amend")
-    public R amend(@RequestBody WareHouse wareHouse){
+    public R amend(@RequestBody Warehouse wareHouse){
         warehouseService.updateById(wareHouse);
         return R.ok();
     }
 
-    @PostMapping("/")
+    @PostMapping("/delete")
     public R deleteById(@RequestParam(value = "id")Integer id){
         warehouseService.deleted(id);
         return R.ok();

src/main/java/com/spring/modules/warehouse/dao/WarehouseMapper.java

@@ -1,9 +1,9 @@
 package com.spring.modules.warehouse.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.spring.modules.warehouse.entity.WareHouse;
+import com.spring.modules.warehouse.entity.Warehouse;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface WarehouseMapper extends BaseMapper<WareHouse> {
+public interface WarehouseMapper extends BaseMapper<Warehouse> {
 }

src/main/java/com/spring/modules/warehouse/entity/WareHouse.java → src/main/java/com/spring/modules/warehouse/entity/Warehouse.java

@@ -1,12 +1,14 @@
 package com.spring.modules.warehouse.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.spring.common.utils.QueryPage;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 @Data
-public class WareHouse extends QueryPage implements Serializable {
+public class Warehouse extends QueryPage implements Serializable {
     //自增id
     private Integer id;
 
@@ -19,7 +21,7 @@ public class WareHouse extends QueryPage implements Serializable {
     //仓库名称
     private String warehouseName;
 
-    //是否在使用:"0":在使用 "1":未使用
+    //是否在使用:"Y":在使用 "N":未使用
     private String active;
 
     //仓库类型
@@ -38,4 +40,11 @@ public class WareHouse extends QueryPage implements Serializable {
 
     //是否采用库位管理
     private String useLocation;
+
+    //创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    //创建人
+    private String creator;
 }

src/main/java/com/spring/modules/warehouse/service/Impl/LocationServiceImpl.java

@@ -82,6 +82,7 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, LocationEnt
         if (CollectionUtils.isNotEmpty(list)){
             throw new RuntimeException("此库位下还有物品,请勿删除");
         }
+
         this.remove(queryWrapper);
     }
 }

src/main/java/com/spring/modules/warehouse/service/Impl/WarehouseServiceImpl.java

@@ -5,12 +5,14 @@ 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.sys.entity.SysUserEntity;
 import com.spring.modules.warehouse.dao.WarehouseMapper;
-import com.spring.modules.warehouse.entity.WareHouse;
+import com.spring.modules.warehouse.entity.Warehouse;
 import com.spring.modules.warehouse.service.WarehouseService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,7 +20,7 @@ import java.util.List;
 
 @Service
 @Slf4j
-public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,WareHouse> implements WarehouseService {
+public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse> implements WarehouseService {
 
 
     @Autowired
@@ -26,36 +28,36 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,WareHouse>
 
     //分页查询
     @Override
-    public PageUtils getInfo(WareHouse wareHouse) {
-        LambdaQueryWrapper<WareHouse> queryWrapper = new LambdaQueryWrapper<>();
+    public PageUtils getInfo(Warehouse wareHouse) {
+        LambdaQueryWrapper<Warehouse> queryWrapper = new LambdaQueryWrapper<>();
         //根据条件查询
         //仓库编码
         if (StringUtils.isNotEmpty(wareHouse.getWarehouseId())){
-            queryWrapper.eq(WareHouse::getWarehouseId,wareHouse.getWarehouseId());
+            queryWrapper.eq(Warehouse::getWarehouseId,wareHouse.getWarehouseId());
         }
         //工程编号
         if (StringUtils.isNotEmpty(wareHouse.getSite())){
-            queryWrapper.eq(WareHouse::getSite,wareHouse.getSite());
+            queryWrapper.eq(Warehouse::getSite,wareHouse.getSite());
         }
         //仓库名称
         if (StringUtils.isNotEmpty(wareHouse.getWarehouseName())){
-            queryWrapper.eq(WareHouse::getWarehouseName,wareHouse.getWarehouseName());
+            queryWrapper.eq(Warehouse::getWarehouseName,wareHouse.getWarehouseName());
         }
         //保管员
         if (StringUtils.isNotEmpty(wareHouse.getKeeper())){
-            queryWrapper.eq(WareHouse::getKeeper,wareHouse.getKeeper());
+            queryWrapper.eq(Warehouse::getKeeper,wareHouse.getKeeper());
         }
         //是否有效仓库
         if (StringUtils.isNotEmpty(wareHouse.getValidStock())){
-            queryWrapper.eq(WareHouse::getValidStock,wareHouse.getValidStock());
+            queryWrapper.eq(Warehouse::getValidStock,wareHouse.getValidStock());
         }
-        queryWrapper.orderByAsc(WareHouse::getId);
-        IPage<WareHouse> page = this.page(new Page<>(wareHouse.getPage(),wareHouse.getLimit()), queryWrapper);
+        queryWrapper.orderByAsc(Warehouse::getId);
+        IPage<Warehouse> page = this.page(new Page<>(wareHouse.getPage(),wareHouse.getLimit()), queryWrapper);
         return new PageUtils(page);
     }
 
     @Override
-    public void saveByInfo(WareHouse wareHouse) {
+    public void saveByInfo(Warehouse wareHouse) {
         if (StringUtils.isEmpty(wareHouse.getSite())){
             throw new RuntimeException("工厂编号不能为空");
         }
@@ -63,17 +65,19 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,WareHouse>
             throw new RuntimeException("仓库编码不能为空");
         }
         //判断工厂site和id是否有重复
-        LambdaQueryWrapper<WareHouse> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(WareHouse::getSite,wareHouse.getSite());
-        List<WareHouse> list = this.list(queryWrapper);
+        LambdaQueryWrapper<Warehouse> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Warehouse::getSite,wareHouse.getSite());
+        List<Warehouse> list = this.list(queryWrapper);
         if (CollectionUtils.isNotEmpty(list)){
             throw new RuntimeException("工厂编号已被使用");
         }
-        queryWrapper.eq(WareHouse::getWarehouseId,wareHouse.getWarehouseId());
-        List<WareHouse> houses = this.list(queryWrapper);
+        queryWrapper.eq(Warehouse::getWarehouseId,wareHouse.getWarehouseId());
+        List<Warehouse> houses = this.list(queryWrapper);
         if (CollectionUtils.isEmpty(houses)){
             throw new RuntimeException("仓库编码已被使用");
         }
+        SysUserEntity sysUserEntity = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
+        wareHouse.setCreator(sysUserEntity.getUsername());
         //新增
         this.save(wareHouse);
     }

src/main/java/com/spring/modules/warehouse/service/WarehouseService.java

@@ -3,15 +3,15 @@ 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;
+import com.spring.modules.warehouse.entity.Warehouse;
 
-public interface WarehouseService extends IService<WareHouse> {
+public interface WarehouseService extends IService<Warehouse> {
 
     //查询
-    PageUtils getInfo(WareHouse wareHouse);
+    PageUtils getInfo(Warehouse wareHouse);
 
     //新增
-    void saveByInfo(WareHouse wareHouse);
+    void saveByInfo(Warehouse wareHouse);
 
     //删除
     void deleted(Integer id);