出入库

sd-business/src/main/java/com/sd/business/controller/in/InOutStorageBomController.java

@@ -0,0 +1,71 @@
+package com.sd.business.controller.in;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.entity.in.dto.InOutStorageBomDto;
+import com.sd.business.entity.in.dto.InOutStorageBomSelectDto;
+import com.sd.business.entity.in.vo.InOutStorageBomVo;
+import com.sd.business.service.in.InOutStorageBomService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+
+/**
+ * <p>
+ * 出入库bom 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@RestController
+@RequestMapping("/inOutStorageBom")
+public class InOutStorageBomController {
+
+    @Autowired
+    private InOutStorageBomService inOutStorageBomService;
+
+    /**
+     * 出入库bom分页
+     */
+    @PostMapping("/page")
+    public Page<InOutStorageBomVo> page(@RequestBody InOutStorageBomSelectDto dto) {
+        return inOutStorageBomService.getPage(dto);
+    }
+
+    /**
+     * 出入库bom明细
+     */
+    @PostMapping("/detail")
+    public InOutStorageBomVo detail(@RequestBody BaseSelectDto dto) {
+        return inOutStorageBomService.detail(dto.getId());
+    }
+
+    /**
+     * 出入库bom新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody InOutStorageBomDto inOutStorageBomDto) {
+        inOutStorageBomService.add(inOutStorageBomDto);
+    }
+
+    /**
+     * 出入库bom编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody InOutStorageBomDto inOutStorageBomDto) {
+        inOutStorageBomService.edit(inOutStorageBomDto);
+    }
+
+    /**
+     * 出入库bom删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        inOutStorageBomService.delete(dto.getId());
+    }
+
+}

sd-business/src/main/java/com/sd/business/controller/in/InOutStorageController.java

@@ -0,0 +1,72 @@
+package com.sd.business.controller.in;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.entity.in.dto.InOutStorageDto;
+import com.sd.business.entity.in.dto.InOutStorageSelectDto;
+import com.sd.business.entity.in.vo.InOutStorageVo;
+import com.sd.business.service.in.InOutStorageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+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;
+
+
+/**
+ * <p>
+ * 出入库 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@RestController
+@RequestMapping("/inOutStorage")
+public class InOutStorageController {
+
+    @Autowired
+    private InOutStorageService inOutStorageService;
+
+    /**
+     * 出入库分页
+     */
+    @PostMapping("/page")
+    public Page<InOutStorageVo> page(@Validated @RequestBody InOutStorageSelectDto dto) {
+        return inOutStorageService.getPage(dto);
+    }
+
+    /**
+     * 出入库明细
+     */
+    @PostMapping("/detail")
+    public InOutStorageVo detail(@RequestBody BaseSelectDto dto) {
+        return inOutStorageService.detail(dto.getId());
+    }
+
+    /**
+     * 出入库新增
+     */
+    @PostMapping("/add")
+    public void add(@Validated @RequestBody InOutStorageDto inOutStorageDto) {
+        inOutStorageService.add(inOutStorageDto);
+    }
+
+    /**
+     * 出入库编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody InOutStorageDto inOutStorageDto) {
+        inOutStorageService.edit(inOutStorageDto);
+    }
+
+    /**
+     * 出入库删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        inOutStorageService.delete(dto.getId());
+    }
+
+}

sd-business/src/main/java/com/sd/business/entity/in/dto/InOutStorageBomDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.in.dto;
+
+import com.sd.business.entity.in.po.InOutStorageBom;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 出入库bom新增编辑入参实体
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class InOutStorageBomDto extends InOutStorageBom {
+
+}

sd-business/src/main/java/com/sd/business/entity/in/dto/InOutStorageBomSelectDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.in.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 出入库bom列表查询入参实体
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class InOutStorageBomSelectDto extends BaseSelectDto {
+
+}

sd-business/src/main/java/com/sd/business/entity/in/dto/InOutStorageDto.java

@@ -0,0 +1,26 @@
+package com.sd.business.entity.in.dto;
+
+import com.sd.business.entity.in.po.InOutStorage;
+import com.sd.business.entity.in.po.InOutStorageBom;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * 出入库新增编辑入参实体
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class InOutStorageDto extends InOutStorage {
+
+    @Valid
+    @NotEmpty(message = "物料信息不能为空")
+    private List<InOutStorageBom> inOutStorageBomList;
+
+}

sd-business/src/main/java/com/sd/business/entity/in/dto/InOutStorageSelectDto.java

@@ -0,0 +1,45 @@
+package com.sd.business.entity.in.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 出入库列表查询入参实体
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class InOutStorageSelectDto extends BaseSelectDto {
+
+    /**
+     * 类型 1入库 0出库
+     */
+    @NotNull(message = "出入库类型不能为空")
+    private Integer type;
+
+    /**
+     * 出入库单号
+     */
+    private String code;
+
+    /**
+     * 事业部id
+     */
+    private Long departmentId;
+
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+
+    /**
+     * 出入库明细
+     */
+    private Integer detailType;
+
+}

sd-business/src/main/java/com/sd/business/entity/in/emums/InDetailTypeEnum.java

@@ -0,0 +1,42 @@
+package com.sd.business.entity.in.emums;
+
+import com.ruoyi.common.exception.ServiceException;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Getter
+@AllArgsConstructor
+public enum InDetailTypeEnum {
+
+    PURCHASE(1, "采购入库"),
+    PRODUCTION(2, "生产入库"),
+    RETURN_GOODS(3, "退货入库"),
+    GIVE_BACK(4, "归还入库"),
+    OTHER(5, "其他入库"),
+    ABANDON(6, "废弃入库"),
+    CHECK(7, "盘点入库"),
+    ;
+
+    private static final Map<Integer, InDetailTypeEnum> map = new HashMap<>();
+
+    static {
+        for (InDetailTypeEnum inDetailTypeEnum : InDetailTypeEnum.values()) {
+            map.put(inDetailTypeEnum.getKey(), inDetailTypeEnum);
+        }
+    }
+
+    private final Integer key;
+    private final String value;
+
+    public static InDetailTypeEnum getInDetailType(Integer key) {
+        InDetailTypeEnum inDetailTypeEnum = map.get(key);
+        if (inDetailTypeEnum == null) {
+            throw new ServiceException("未知出入库类型");
+        }
+        return inDetailTypeEnum;
+    }
+
+}

sd-business/src/main/java/com/sd/business/entity/in/emums/InOutTypeEnum.java

@@ -0,0 +1,36 @@
+package com.sd.business.entity.in.emums;
+
+import com.ruoyi.common.exception.ServiceException;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Getter
+@AllArgsConstructor
+public enum InOutTypeEnum {
+
+    IN(1, "入库"),
+    OUT(0, "出库");
+
+    private static final Map<Integer, InOutTypeEnum> map = new HashMap<>();
+
+    static {
+        for (InOutTypeEnum inOutTypeEnum : InOutTypeEnum.values()) {
+            map.put(inOutTypeEnum.getKey(), inOutTypeEnum);
+        }
+    }
+
+    private final Integer key;
+    private final String value;
+
+    public static InOutTypeEnum getInOutType(Integer key) {
+        InOutTypeEnum inOutTypeEnum = map.get(key);
+        if (inOutTypeEnum == null) {
+            throw new ServiceException("未知出入库类型");
+        }
+        return inOutTypeEnum;
+    }
+
+}

sd-business/src/main/java/com/sd/business/entity/in/emums/OutDetailTypeEnum.java

@@ -0,0 +1,43 @@
+package com.sd.business.entity.in.emums;
+
+import com.ruoyi.common.exception.ServiceException;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Getter
+@AllArgsConstructor
+public enum OutDetailTypeEnum {
+
+    PRODUCTION(1, "生产出库"),
+    SELL(2, "销售出库"),
+    ALLOT(3, "调拨出库"),
+    INVENTORY_LOSS(4, "盘亏出库"),
+    HELP_ONESELF(5, "自用出库"),
+    OTHER(6, "其他出库"),
+    CHECK(7, "盘点出库"),
+    PURCHASE(8, "采购出库"),
+    ;
+
+    private static final Map<Integer, OutDetailTypeEnum> map = new HashMap<>();
+
+    static {
+        for (OutDetailTypeEnum outDetailTypeEnum : OutDetailTypeEnum.values()) {
+            map.put(outDetailTypeEnum.getKey(), outDetailTypeEnum);
+        }
+    }
+
+    private final Integer key;
+    private final String value;
+
+    public static OutDetailTypeEnum getOutDetailType(Integer key) {
+        OutDetailTypeEnum outDetailTypeEnum = map.get(key);
+        if (outDetailTypeEnum == null) {
+            throw new ServiceException("未知出入库类型");
+        }
+        return outDetailTypeEnum;
+    }
+
+}

sd-business/src/main/java/com/sd/business/entity/in/po/InOutStorage.java

@@ -0,0 +1,69 @@
+package com.sd.business.entity.in.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 出入库
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+@TableName("in_out_storage")
+public class InOutStorage extends BasePo {
+
+    /**
+     * 类型 1入库 0出库
+     */
+    @NotNull(message = "出入库类型不能为空")
+    private Integer type;
+
+    /**
+     * 出入库明细
+     */
+    @NotNull(message = "出入库明细类型不能为空")
+    private Integer detailType;
+
+    /**
+     * 出入库单号
+     */
+    private String code;
+
+    /**
+     * 采购合同id
+     */
+    private Long purchaseId;
+
+    /**
+     * 仓库id
+     */
+    @NotNull(message = "仓库id不能为空")
+    private Long warehouseId;
+
+    /**
+     * 事业部id
+     */
+    @NotNull(message = "事业部id不能为空")
+    private Long departmentId;
+
+    /**
+     * 申请人
+     */
+    @NotBlank(message = "申请人不能为空")
+    private String applicant;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

sd-business/src/main/java/com/sd/business/entity/in/po/InOutStorageBom.java

@@ -0,0 +1,42 @@
+package com.sd.business.entity.in.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 出入库bom
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+@TableName("in_out_storage_bom")
+public class InOutStorageBom extends BasePo {
+
+    /**
+     * 出入库id
+     */
+    private Long inOutStorageId;
+
+    /**
+     * bom规格id
+     */
+    @NotNull(message = "bom规格id不能为空")
+    private Long bomSpecId;
+
+    /**
+     * 数量
+     */
+    @DecimalMin(value = "0.01", message = "出入库数量必须大于0")
+    private BigDecimal quantity;
+
+}

sd-business/src/main/java/com/sd/business/entity/in/vo/InOutStorageBomVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.in.vo;
+
+import com.sd.business.entity.in.po.InOutStorageBom;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 出入库bom列表查询返回值实体
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class InOutStorageBomVo extends InOutStorageBom {
+
+}

sd-business/src/main/java/com/sd/business/entity/in/vo/InOutStorageVo.java

@@ -0,0 +1,32 @@
+package com.sd.business.entity.in.vo;
+
+import com.sd.business.entity.in.po.InOutStorage;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 出入库列表查询返回值实体
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class InOutStorageVo extends InOutStorage {
+
+    /**
+     * 仓库类型 字典:warehouse_type
+     */
+    private String warehouseType;
+
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+
+    /**
+     * 事业部名称
+     */
+    private String departmentName;
+
+}

sd-business/src/main/java/com/sd/business/mapper/in/InOutStorageBomMapper.java

@@ -0,0 +1,26 @@
+package com.sd.business.mapper.in;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.in.po.InOutStorageBom;
+import com.sd.business.entity.in.vo.InOutStorageBomVo;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 出入库bom Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+public interface InOutStorageBomMapper extends BaseMapper<InOutStorageBom> {
+
+    /**
+     * 出入库bom分页
+     */
+    Page<InOutStorageBomVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<InOutStorageBom> wrapper);
+
+}

sd-business/src/main/java/com/sd/business/mapper/in/InOutStorageMapper.java

@@ -0,0 +1,26 @@
+package com.sd.business.mapper.in;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.in.po.InOutStorage;
+import com.sd.business.entity.in.vo.InOutStorageVo;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 出入库 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+public interface InOutStorageMapper extends BaseMapper<InOutStorage> {
+
+    /**
+     * 出入库分页
+     */
+    Page<InOutStorageVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<InOutStorage> wrapper);
+
+}

sd-business/src/main/java/com/sd/business/service/in/InOutStorageBomService.java

@@ -0,0 +1,46 @@
+package com.sd.business.service.in;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.in.dto.InOutStorageBomDto;
+import com.sd.business.entity.in.dto.InOutStorageBomSelectDto;
+import com.sd.business.entity.in.po.InOutStorageBom;
+import com.sd.business.entity.in.vo.InOutStorageBomVo;
+
+
+/**
+ * <p>
+ * 出入库bom 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+public interface InOutStorageBomService extends BaseService<InOutStorageBom> {
+
+    /**
+     * 出入库bom分页
+     */
+    Page<InOutStorageBomVo> getPage(InOutStorageBomSelectDto dto);
+
+    /**
+     * 出入库bom明细
+     */
+    InOutStorageBomVo detail(Long id);
+
+    /**
+     * 出入库bom新增
+     */
+    void add(InOutStorageBomDto inOutStorageBomDto);
+
+    /**
+     * 出入库bom编辑
+     */
+    void edit(InOutStorageBomDto inOutStorageBomDto);
+
+    /**
+     * 出入库bom删除
+     */
+    void delete(Long id);
+
+}

sd-business/src/main/java/com/sd/business/service/in/InOutStorageService.java

@@ -0,0 +1,46 @@
+package com.sd.business.service.in;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.in.dto.InOutStorageDto;
+import com.sd.business.entity.in.dto.InOutStorageSelectDto;
+import com.sd.business.entity.in.po.InOutStorage;
+import com.sd.business.entity.in.vo.InOutStorageVo;
+
+
+/**
+ * <p>
+ * 出入库 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+public interface InOutStorageService extends BaseService<InOutStorage> {
+
+    /**
+     * 出入库分页
+     */
+    Page<InOutStorageVo> getPage(InOutStorageSelectDto dto);
+
+    /**
+     * 出入库明细
+     */
+    InOutStorageVo detail(Long id);
+
+    /**
+     * 出入库新增
+     */
+    void add(InOutStorageDto inOutStorageDto);
+
+    /**
+     * 出入库编辑
+     */
+    void edit(InOutStorageDto inOutStorageDto);
+
+    /**
+     * 出入库删除
+     */
+    void delete(Long id);
+
+}

sd-business/src/main/java/com/sd/business/service/in/impl/InOutStorageBomServiceImpl.java

@@ -0,0 +1,57 @@
+package com.sd.business.service.in.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.in.dto.InOutStorageBomDto;
+import com.sd.business.entity.in.dto.InOutStorageBomSelectDto;
+import com.sd.business.entity.in.po.InOutStorageBom;
+import com.sd.business.entity.in.vo.InOutStorageBomVo;
+import com.sd.business.mapper.in.InOutStorageBomMapper;
+import com.sd.business.service.in.InOutStorageBomService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 出入库bom 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Service
+public class InOutStorageBomServiceImpl extends ServiceImpl<InOutStorageBomMapper, InOutStorageBom> implements InOutStorageBomService {
+
+    @Override
+    public Page<InOutStorageBomVo> getPage(InOutStorageBomSelectDto dto) {
+        IWrapper<InOutStorageBom> wrapper = getWrapper();
+        wrapper.orderByDesc("iosb", InOutStorageBom::getId);
+        Page<InOutStorageBomVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public InOutStorageBomVo detail(Long id) {
+        InOutStorageBom InOutStorageBom = this.getById(id);
+        InOutStorageBomVo result = BeanUtil.toBean(InOutStorageBom, InOutStorageBomVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(InOutStorageBomDto inOutStorageBomDto) {
+        this.save(inOutStorageBomDto);
+    }
+
+    @Override
+    public void edit(InOutStorageBomDto inOutStorageBomDto) {
+        this.updateById(inOutStorageBomDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

sd-business/src/main/java/com/sd/business/service/in/impl/InOutStorageServiceImpl.java

@@ -0,0 +1,90 @@
+package com.sd.business.service.in.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.in.dto.InOutStorageDto;
+import com.sd.business.entity.in.dto.InOutStorageSelectDto;
+import com.sd.business.entity.in.emums.InOutTypeEnum;
+import com.sd.business.entity.in.po.InOutStorage;
+import com.sd.business.entity.in.po.InOutStorageBom;
+import com.sd.business.entity.in.vo.InOutStorageVo;
+import com.sd.business.entity.warehouse.po.Warehouse;
+import com.sd.business.mapper.in.InOutStorageMapper;
+import com.sd.business.service.in.InOutStorageBomService;
+import com.sd.business.service.in.InOutStorageService;
+import com.sd.business.util.CodeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 出入库 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Service
+public class InOutStorageServiceImpl extends ServiceImpl<InOutStorageMapper, InOutStorage> implements InOutStorageService {
+
+    @Autowired
+    private InOutStorageBomService inOutStorageBomService;
+
+    @Override
+    public Page<InOutStorageVo> getPage(InOutStorageSelectDto dto) {
+        IWrapper<InOutStorage> wrapper = getWrapper();
+        wrapper.orderByDesc("ios", InOutStorage::getId);
+        wrapper.eq("ios", InOutStorage::getType, dto.getType());
+        wrapper.like("ios", InOutStorage::getCode, dto.getCode());
+        wrapper.eq("ios", InOutStorage::getDepartmentId, dto.getDepartmentId());
+        wrapper.like("w", Warehouse::getName, dto.getWarehouseName());
+        wrapper.eq("ios", InOutStorage::getDetailType, dto.getDetailType());
+        wrapper.ge("ios", InOutStorage::getCreateTime, dto.getBeginTime());
+        wrapper.le("ios", InOutStorage::getCreateTime, dto.getEndTime());
+
+        Page<InOutStorageVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public InOutStorageVo detail(Long id) {
+        InOutStorage InOutStorage = this.getById(id);
+        InOutStorageVo result = BeanUtil.toBean(InOutStorage, InOutStorageVo.class);
+        return result;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void add(InOutStorageDto inOutStorageDto) {
+
+        InOutTypeEnum inOutType = InOutTypeEnum.getInOutType(inOutStorageDto.getType());
+        if (inOutType.equals(InOutTypeEnum.IN)) {
+            inOutStorageDto.setCode(CodeEnum.IN_CODE.getCode());
+        } else {
+            inOutStorageDto.setCode(CodeEnum.OUT_CODE.getCode());
+        }
+        this.save(inOutStorageDto);
+
+        List<InOutStorageBom> inOutStorageBomList = inOutStorageDto.getInOutStorageBomList();
+        inOutStorageBomList.forEach(item -> item.setInOutStorageId(inOutStorageDto.getId()));
+        inOutStorageBomService.saveBatch(inOutStorageBomList);
+
+    }
+
+    @Override
+    public void edit(InOutStorageDto inOutStorageDto) {
+        this.updateById(inOutStorageDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryBackupServiceImpl.java

@@ -57,8 +57,8 @@ public class InventoryBackupServiceImpl extends ServiceImpl<InventoryBackupMappe
 
         IWrapper<InventoryBackup> wrapper = getWrapper();
         wrapper.orderByDesc("ib", InventoryBackup::getId);
-        wrapper.le("ib", InventoryBackup::getBackupDate, dto.getBeginTime());
-        wrapper.ge("ib", InventoryBackup::getBackupDate, dto.getEndTime());
+        wrapper.ge("ib", InventoryBackup::getBackupDate, dto.getBeginTime());
+        wrapper.le("ib", InventoryBackup::getBackupDate, dto.getEndTime());
 
         Page<InventoryBackupVo> page = baseMapper.getPage(dto.getPage(), wrapper);
         List<InventoryBackupVo> records = page.getRecords();

sd-business/src/main/java/com/sd/business/util/CodeEnum.java

@@ -8,6 +8,7 @@ import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.exception.ServiceException;
 import com.sd.business.service.apply.ApplyBuyService;
+import com.sd.business.service.in.InOutStorageService;
 import com.sd.business.service.lend.LendService;
 import lombok.Getter;
 
@@ -21,6 +22,10 @@ public enum CodeEnum {
     APPLY_BUY_CODE("PA", "-yyMMdd-", "code", 6, ApplyBuyService.class),
     // 借出编号
     LEND_CODE("BL", "-yyMMdd-", "code", 6, LendService.class),
+    // 入库编号
+    IN_CODE("DTS", "-yyMMdd-", "code", 6, InOutStorageService.class),
+    // 入库编号
+    OUT_CODE("OS", "-yyMMdd-", "code", 6, InOutStorageService.class),
     ;
 
     // 编码前缀

sd-business/src/main/resources/mapper/in/InOutStorageBomMapper.xml

@@ -0,0 +1,17 @@
+<?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="com.sd.business.mapper.in.InOutStorageBomMapper">
+    <select id="getPage" resultType="com.sd.business.entity.in.vo.InOutStorageBomVo">
+        select iosb.id,
+               iosb.in_out_storage_id,
+               iosb.bom_spec_id,
+               iosb.quantity,
+               iosb.create_user,
+               iosb.create_time,
+               iosb.update_user,
+               iosb.update_time
+        from in_out_storage_bom iosb
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

sd-business/src/main/resources/mapper/in/InOutStorageMapper.xml

@@ -0,0 +1,26 @@
+<?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="com.sd.business.mapper.in.InOutStorageMapper">
+    <select id="getPage" resultType="com.sd.business.entity.in.vo.InOutStorageVo">
+        select ios.id,
+               ios.type,
+               ios.detail_type,
+               ios.code,
+               ios.business_id,
+               ios.business_code,
+               ios.warehouse_id,
+               ios.department_id,
+               ios.create_user,
+               ios.create_time,
+               ios.update_user,
+               ios.update_time,
+               w.type warehouseType,
+               w.name warehouseName,
+               d.name departmentName
+        from in_out_storage ios
+                 left join warehouse w on ios.warehouse_id = w.id
+                 left join department d on ios.department_id = d.id
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>