feat：新增进销存管理模块

ruoyi-modules/ruoyi-InventoryManagement/pom.xml

@@ -12,7 +12,7 @@
     <artifactId>ruoyi-InventoryManagement</artifactId>
 
     <description>
-        demo模块
+        进销存管理模块
     </description>
 
     <dependencies>
@@ -103,6 +103,11 @@
             <artifactId>ruoyi-common-websocket</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-commodityManagement</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

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

@@ -0,0 +1,38 @@
+package org.dromara.InventoryManagement.controller;
+
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.bo.PutInStorageBo;
+import org.dromara.InventoryManagement.domain.vo.PutInStorageVo;
+import org.dromara.InventoryManagement.service.PutInStorageService;
+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.*;
+
+@SaIgnore
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/inventoryManagement/putInStorage")
+public class PutInStorageController extends BaseController {
+
+    private final PutInStorageService putInStorageService;
+
+    /**
+     * 查询入库订单分页列表
+     * @param putInStorageBo
+     * @param pageQuery
+     * @return
+     */
+    @GetMapping("/PageList")
+    public TableDataInfo<PutInStorageVo> selectPutInStoragePageList(PutInStorageBo putInStorageBo, PageQuery pageQuery) {
+        return putInStorageService.selectPutInStoragePageList(putInStorageBo, pageQuery);
+    }
+
+    @PostMapping
+    public R<Void> insert(@RequestBody PutInStorageBo putInStorageBo){
+        return toAjax(putInStorageService.insertInventory(putInStorageBo));
+    }
+}

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

@@ -0,0 +1,45 @@
+package org.dromara.InventoryManagement.domain;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fa_ykjp_storage")
+public class PutInStorage extends TenantEntity {
+
+    /**
+     * 主键Id
+     */
+    private int id;
+
+    /**
+     * 单据编号
+     */
+    private String code;
+
+    /**
+     * 入库类型 0=采购入库，1=销售退货入库
+     */
+    private int inboundType;
+
+    /**
+     * 库区
+     */
+    private int partitionId;
+
+    /**
+     * 入库单状态
+     */
+    private String status;
+
+    /**
+     * 入库单更新时间
+     */
+    private Date updatetime;
+}

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

@@ -0,0 +1,36 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.InventoryManagement.domain.PutInStorage;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PutInStorage.class, reverseConvertGenerate = false)
+public class PutInStorageBo extends BaseEntity {
+
+    /**
+     * 主键Id
+     */
+    private int id;
+
+    /**
+     * 单据编号
+     */
+    private String code;
+
+    /**
+     * 入库单状态
+     */
+    private String status;
+
+    /**
+     * 入库单更新时间
+     */
+    private Date updatetime;
+}

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

@@ -0,0 +1,36 @@
+package org.dromara.InventoryManagement.domain.vo;
+
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.InventoryManagement.domain.PutInStorage;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PutInStorage.class)
+public class PutInStorageVo extends BaseEntity {
+
+    /**
+     * 主键Id
+     */
+    private int id;
+
+    /**
+     * 单据编号
+     */
+    private String code;
+
+    /**
+     * 入库单状态
+     */
+    private String status;
+
+    /**
+     * 入库单更新时间
+     */
+    private Date updatetime;
+}

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

@@ -0,0 +1,10 @@
+package org.dromara.InventoryManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.InventoryManagement.domain.PutInStorage;
+import org.dromara.InventoryManagement.domain.vo.PutInStorageVo;
+
+@Mapper
+public interface PutInStorageMapper extends BaseMapperPlus<PutInStorage, PutInStorageVo> {
+}

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

@@ -0,0 +1,53 @@
+package org.dromara.InventoryManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.PutInStorage;
+import org.dromara.InventoryManagement.domain.bo.PutInStorageBo;
+import org.dromara.InventoryManagement.domain.vo.PutInStorageVo;
+import org.dromara.InventoryManagement.mapper.PutInStorageMapper;
+import org.dromara.InventoryManagement.service.PutInStorageService;
+import org.dromara.commodityManagement.domain.bo.DiBuBo;
+import org.dromara.commodityManagement.service.impl.DiBuServiceImpl;
+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.List;
+
+
+@Service
+@RequiredArgsConstructor
+public class PutInStorageServiceImpl implements PutInStorageService {
+
+    private final PutInStorageMapper putInStorageMapper;
+
+    private final DiBuServiceImpl diBuService;
+
+    /**
+     * 查询入库订单分页列表
+     * @param putInStorageBo
+     * @param pageQuery
+     * @return
+     */
+    @Override
+    public TableDataInfo<PutInStorageVo> selectPutInStoragePageList(PutInStorageBo putInStorageBo, PageQuery pageQuery) {
+        QueryWrapper<PutInStorage> qw = new QueryWrapper<>();
+        qw.like(StringUtils.isNotBlank(putInStorageBo.getCode()), "code", putInStorageBo.getCode());
+        qw.eq(StringUtils.isNotBlank(putInStorageBo.getStatus()), "status", putInStorageBo.getStatus());
+//        qw.eq(StringUtils.isNotBlank();
+
+        List<PutInStorage> page = putInStorageMapper.selectList(pageQuery.build(), qw);
+        List<PutInStorageVo> supplierVoList = MapstructUtils.convert(page, PutInStorageVo.class);
+        return TableDataInfo.build(supplierVoList);
+    }
+
+    @Override
+    public int insertInventory(PutInStorageBo putInStorageBo) {
+        PutInStorage putInStorage = MapstructUtils.convert(putInStorageBo, PutInStorage.class);
+        // 入库数
+        return putInStorageMapper.insert(putInStorage);
+    }
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/resources/mapper/PutInStorageMapper.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.PutInStorageMapper">
+
+</mapper>