Merge remote-tracking branch 'origin/develop' into develop

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/controller/PutInStorageTypeController.java

@@ -0,0 +1,59 @@
+package org.dromara.InventoryManagement.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.bo.PutInStorageTypeBo;
+import org.dromara.InventoryManagement.domain.vo.PutInStorageTypeVo;
+import org.dromara.InventoryManagement.service.PutInStorageTypeService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/inventoryManagement/putinstoragetype")
+public class PutInStorageTypeController extends BaseController {
+    private final PutInStorageTypeService putInStorageTypeService;
+    @GetMapping("/PageList")
+    public TableDataInfo <PutInStorageTypeVo> selectPutInStorageTypePageList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery){
+        return putInStorageTypeService.selectPutInStorageTypePageList(putInStorageTypeBo,pageQuery);
+    }
+    @PostMapping
+    public R<Void> insertPutInStorageType(@RequestBody PutInStorageTypeBo putInStorageTypeBo){
+        return toAjax(putInStorageTypeService.insertPutInStorageType(putInStorageTypeBo));
+    }
+    @PutMapping
+    public R<Void> updatePutInStorageType(@RequestBody PutInStorageTypeBo putInStorageTypeBo){
+        return toAjax(putInStorageTypeService.updatePutInStorageType(putInStorageTypeBo));
+    }
+    @DeleteMapping("/{ids}")
+    public R<Void> deletePutInStorageTypeByIds(@PathVariable List<Integer> ids){
+        return toAjax(putInStorageTypeService.deletePutInStorageTypeByIds(ids));
+    }
+    @GetMapping("/recycle")
+    public TableDataInfo<PutInStorageTypeVo> selectRecyclePutInStorageTypeList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery){
+        return putInStorageTypeService.selectRecyclePutInStorageTypeList(putInStorageTypeBo,pageQuery);
+    }
+    @PostMapping("/recycle/back/{ids}")
+    public R<Void> backPutInStorageTypeByIds(@PathVariable List<Integer> ids){
+        return toAjax(putInStorageTypeService.backPutInStorageTypeByIds(ids));
+    }
+    @PostMapping("/recycle/back/all")
+    public R<Void> backPutInStorageTypeAll(){
+        return toAjax(putInStorageTypeService.backPutInStorageTypeAll());
+    }
+    @DeleteMapping("/recycle/{ids}")
+    public R<Void> deleteRecyclePutInStorageTypeByIds(@PathVariable List<Integer> ids){
+        int status = putInStorageTypeService.deleteRecyclePutInStorageTypeByIds(ids);
+        if(status==1){
+            return toAjax(1);
+        }
+        return R.fail("该回收站中不存在此入库类型或已被删除");
+    }
+    @DeleteMapping("recycle/all")
+    public R<Void> deleteRecyclePutInStorageTypeAll(){
+        return toAjax(putInStorageTypeService.deleteRecyclePutInStorageTypeAll());
+    }
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/PutInStorageType.java

@@ -0,0 +1,30 @@
+package org.dromara.InventoryManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+
+@Data
+@TableName("fa_ykjp_warehouse_in")
+public class PutInStorageType {
+    /**
+     * ID
+     */
+    private int ID;
+    /**
+     * 入库类型
+     */
+    private String name;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
+    /**
+     * 删除时间
+     */
+    private String deletetime;
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/bo/PutInStorageTypeBo.java

@@ -0,0 +1,42 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.InventoryManagement.domain.PutInStorageType;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+@AutoMapper(target = PutInStorageType.class, reverseConvertGenerate = false)
+public class PutInStorageTypeBo {
+    /**
+     * ID
+     */
+    private int ID;
+    /**
+     * 入库类型
+     */
+    private String name;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
+    /**
+     * 删除时间
+     */
+    private String deletetime;
+
+    /**
+     * 请求参数
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/vo/PutInStorageTypeVo.java

@@ -0,0 +1,30 @@
+package org.dromara.InventoryManagement.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.InventoryManagement.domain.PutInStorageType;
+
+@Data
+@AutoMapper(target = PutInStorageType.class)
+public class PutInStorageTypeVo {
+    /**
+     * ID
+     */
+    private int ID;
+    /**
+     * 入库类型
+     */
+    private String name;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
+    /**
+     * 删除时间
+     */
+    private String deletetime;
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/mapper/PutInStorageTypeMapper.java

@@ -0,0 +1,11 @@
+package org.dromara.InventoryManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.InventoryManagement.domain.PutInStorageType;
+import org.dromara.InventoryManagement.domain.vo.PutInStorageTypeVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+
+@Mapper
+public interface PutInStorageTypeMapper extends BaseMapperPlus<PutInStorageType, PutInStorageTypeVo> {
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/PutInStorageTypeService.java

@@ -0,0 +1,28 @@
+package org.dromara.InventoryManagement.service;
+
+import org.dromara.InventoryManagement.domain.bo.PutInStorageTypeBo;
+import org.dromara.InventoryManagement.domain.vo.PutInStorageTypeVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.List;
+
+public interface PutInStorageTypeService {
+    TableDataInfo<PutInStorageTypeVo> selectPutInStorageTypePageList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery);
+
+    int insertPutInStorageType(PutInStorageTypeBo putInStorageTypeBo);
+
+    int updatePutInStorageType(PutInStorageTypeBo putInStorageTypeBo);
+
+    int deletePutInStorageTypeByIds(List<Integer> ids);
+
+    TableDataInfo<PutInStorageTypeVo> selectRecyclePutInStorageTypeList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery);
+
+    int backPutInStorageTypeByIds(List<Integer> ids);
+
+    int backPutInStorageTypeAll();
+
+    int deleteRecyclePutInStorageTypeByIds(List<Integer> ids);
+
+    int deleteRecyclePutInStorageTypeAll();
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/impl/PutInStorageTypeServiceImpl.java

@@ -0,0 +1,90 @@
+package org.dromara.InventoryManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.PutInStorageType;
+import org.dromara.InventoryManagement.domain.bo.PutInStorageTypeBo;
+import org.dromara.InventoryManagement.domain.vo.PutInStorageTypeVo;
+import org.dromara.InventoryManagement.mapper.PutInStorageTypeMapper;
+import org.dromara.InventoryManagement.service.PutInStorageTypeService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+public class PutInStorageTypeServiceImpl implements PutInStorageTypeService {
+    private final PutInStorageTypeMapper putInStorageTypeMapper;
+    @Override
+    public TableDataInfo <PutInStorageTypeVo> selectPutInStorageTypePageList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery) {
+        QueryWrapper<PutInStorageType> qw = new QueryWrapper<>();
+        qw.like(putInStorageTypeBo.getID() != 0,"id",putInStorageTypeBo.getID());
+        qw.like(StringUtils.isNotBlank(putInStorageTypeBo.getName()),"name",putInStorageTypeBo.getName());
+        Page<PutInStorageTypeVo>page= putInStorageTypeMapper.selectVoPage(pageQuery.build(),qw);
+        return TableDataInfo.build(page);
+    }
+    @Override
+    public int insertPutInStorageType(PutInStorageTypeBo putInStorageTypeBo) {
+        PutInStorageType putInStorageType = MapstructUtils.convert(putInStorageTypeBo, PutInStorageType.class);
+        return putInStorageTypeMapper.insert(putInStorageType);
+    }
+    @Override
+    public int updatePutInStorageType(PutInStorageTypeBo putInStorageTypeBo) {
+        PutInStorageType putInStorageType = MapstructUtils.convert(putInStorageTypeBo, PutInStorageType.class);
+        return putInStorageTypeMapper.updateById(putInStorageType);
+    }
+    @Override
+    public int deletePutInStorageTypeByIds(List<Integer> putInStorageTypeIds){
+        UpdateWrapper<PutInStorageType> updateWrapper=new UpdateWrapper<>();
+        updateWrapper.in("id", putInStorageTypeIds);
+        updateWrapper.set("deletetime",new Date());
+        return putInStorageTypeMapper.update(updateWrapper);
+    }
+    @Override
+    public TableDataInfo <PutInStorageTypeVo> selectRecyclePutInStorageTypeList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery) {
+        QueryWrapper<PutInStorageType> qw = new QueryWrapper<>();
+        Map<String, Object> params=putInStorageTypeBo.getParams();
+        qw.eq(0 !=putInStorageTypeBo.getID(),"id",putInStorageTypeBo.getID());
+        qw.like(StringUtils.isNotBlank(putInStorageTypeBo.getName()),"name",putInStorageTypeBo.getName());
+        qw.between(params.get("begindeletetime") != null && params.get("enddeletetime") != null,
+                "deletetime", params.get("begindeletetime"), params.get("enddeletetime"));
+        qw.isNotNull("deletetime");
+        Page<PutInStorageTypeVo> page = putInStorageTypeMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
+    @Override
+    public int backPutInStorageTypeByIds(List<Integer> putInStorageTypeIds) {
+        UpdateWrapper<PutInStorageType> updateWrapper=new UpdateWrapper<>();
+        updateWrapper.in("id", putInStorageTypeIds);
+        updateWrapper.set("deletetime",null);
+        return putInStorageTypeMapper.update(updateWrapper);
+    }
+    @Override
+    public int backPutInStorageTypeAll() {
+        UpdateWrapper<PutInStorageType> updateWrapper=new UpdateWrapper<>();
+        updateWrapper.set("deletetime",null);
+        return putInStorageTypeMapper.update(updateWrapper);
+    }
+    @Override
+    public int deleteRecyclePutInStorageTypeByIds(List<Integer> putInStorageTypeIds) {
+        QueryWrapper<PutInStorageType> qw=new QueryWrapper<>();
+        qw.in("id",putInStorageTypeIds);
+        qw.isNotNull("deletetime");
+        return putInStorageTypeMapper.delete(qw);
+    }
+    @Override
+    public int deleteRecyclePutInStorageTypeAll() {
+        QueryWrapper<PutInStorageType> qw=new QueryWrapper<>();
+        qw.isNotNull("deletetime");
+        return putInStorageTypeMapper.delete(qw);
+    }
+}
+

ruoyi-modules/ruoyi-InventoryManagement/src/main/resources/mapper/PutInStorageTypeMapper.xml

@@ -0,0 +1,7 @@
+<?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.dromara.InventoryManagement.mapper.PutInStorageTypeMapper">
+
+</mapper>