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

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

@@ -0,0 +1,54 @@
+package org.dromara.InventoryManagement.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.bo.InventorySheetBo;
+import org.dromara.InventoryManagement.domain.vo.InventorySheetVo;
+import org.dromara.InventoryManagement.service.InventorySheetService;
+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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 盘点单接口
+ */
+@SaIgnore
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/inventoryManagement/inventorySheet")
+public class InventorySheetController extends BaseController {
+    private final InventorySheetService inventorySheetService;
+    /**
+     * 查询盘点单列表
+     * @param inventorySheet 盘点单Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @GetMapping("/PageList")
+    public TableDataInfo<InventorySheetVo> selectPageInventorySheetList(InventorySheetBo inventorySheet, PageQuery pageQuery) {
+        return inventorySheetService.selectPageInventorySheetList(inventorySheet,pageQuery);
+    }
+
+    /**
+     * 新增盘点单数据
+     * @param inventorySheet 盘点单Bo对象
+     * @return 新增结果
+     */
+    @PostMapping()
+    public R<Void> insertInventorySheet(@Validated @RequestBody InventorySheetBo inventorySheet) {
+        return toAjax(inventorySheetService.insertInventorySheet(inventorySheet));
+    }
+
+    /**
+     * 删除盘点单数据
+     * @param inventorySheetIds 盘点单ID
+     * @return 删除结果
+     */
+    @DeleteMapping("/{inventorySheetIds}")
+    public R<Void> deleteInventorySheetByIds(@PathVariable Long[] inventorySheetIds) {
+        return toAjax(inventorySheetService.deleteInventorySheetByIds(inventorySheetIds));
+    }
+}

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

@@ -29,9 +29,9 @@ public class PutInStorageController extends BaseController {
      * @param pageQuery 分页信息
      * @return 结果
      */
-    @GetMapping("/PageList")
-    public TableDataInfo<StorageVo> selectPutInStoragePageList(StorageBo storageBo, PageQuery pageQuery) {
-        return putInStorageService.selectPutInStoragePageList(storageBo, pageQuery);
+    @GetMapping("/order/PageList")
+    public TableDataInfo<StorageVo> selectStoragePageList(StorageBo storageBo, PageQuery pageQuery) {
+        return putInStorageService.selectStoragePageList(storageBo, pageQuery);
     }
 
     /**
@@ -54,8 +54,34 @@ public class PutInStorageController extends BaseController {
         return toAjax(putInStorageService.deleteById(ids));
     }
 
-    @PutMapping
+    /**
+     * 修改入库订单
+     * @param putInStorageBo 传入Bo类
+     * @return 结果
+     */
+    @PutMapping("/updateStorage")
     public R<Void> update(@RequestBody PutInStorageBo putInStorageBo) {
         return toAjax(putInStorageService.updateStorage(putInStorageBo));
     }
+
+    /**
+     * 查询入库审核信息分页列表
+     * @param storageBo 入库订单表
+     * @param pageQuery 分页信息
+     * @return 结果
+     */
+    @GetMapping("/process/PageList")
+    public TableDataInfo<StorageVo> selectProcessPageList(StorageBo storageBo, PageQuery pageQuery) {
+        return putInStorageService.selectStorageProcessPageList(storageBo, pageQuery);
+    }
+
+    /**
+     * 修改入库审核信息
+     * @param storageBo 入库订单表
+     * @return 结果
+     */
+    @PutMapping("/updateStorageProcess")
+    public R<Void> updateStorageProcess(@RequestBody StorageBo storageBo) {
+        return toAjax(putInStorageService.updateStorageProcess(storageBo));
+    }
 }

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

@@ -0,0 +1,49 @@
+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_stock")
+public class InventorySheet extends TenantEntity {
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 编号
+     */
+    private String idSn;
+
+    /**
+     * 创建人
+     */
+    private Long adminId;
+
+    /**
+     * 盘点单状态
+     */
+    private Integer status;
+
+    /**
+     * 盘点数量
+     */
+    private int nums;
+
+    /**
+     * 删除时间
+     */
+    private Date deleteTime;
+
+
+}

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

@@ -2,6 +2,7 @@ package org.dromara.InventoryManagement.domain;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -26,15 +27,21 @@ public class Storage extends TenantEntity {
      */
     private String code;
 
+    /**
+     * 入库数总量
+     */
+    @TableField(value = "totalNums")
+    private double totalNums;
+
     /**
      * 库区
      */
     private int partitionId;
 
     /**
-     * 入库单状态
+     * 入库单状态 0=未审核，1=待入库，2=审核未通过，3=已审核
      */
-    private String status;
+    private String status = "0";
 
     /**
      * 备注

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

@@ -30,7 +30,7 @@ public class StorageProduct extends TenantEntity {
     private int productId;
 
     /**
-     * 仓库Id
+     * 入库类型
      */
     private int warehouseId;
 

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

@@ -0,0 +1,49 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.InventoryManagement.domain.InventorySheet;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 盘点单业务对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InventorySheet.class,reverseConvertGenerate = false)
+public class InventorySheetBo extends BaseEntity {
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 编号
+     */
+    private String idSn;
+
+    /**
+     * 创建人
+     */
+    private Long adminId;
+
+    /**
+     * 盘点单状态
+     */
+    private Integer status;
+
+    /**
+     * 盘点数量
+     */
+    private int nums;
+
+
+    /**
+     * 删除时间
+     */
+    private Date deleteTime;
+
+}

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

@@ -11,7 +11,7 @@ import java.util.List;
 public class PutInStorageBo extends BaseEntity {
 
     /**
-     * Id
+     * 主键Id
      */
     private int id;
 

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

@@ -1,6 +1,7 @@
 package org.dromara.InventoryManagement.domain.bo;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,15 +26,26 @@ public class StorageBo extends BaseEntity {
     private String code;
 
     /**
-     * 入库单状态
+     * 入库数总量
      */
-    private String status;
+    @TableField(value = "totalNums")
+    private double totalNums;
+
+    /**
+     * 入库单状态 0=未审核，1=待入库，2=审核未通过，3=已审核
+     */
+    private String status = "0";
 
     /**
      * 库区
      */
     private int partitionId;
 
+    /**
+     * 入库类型
+     */
+    private int warehouseId;
+
     /**
      * 入库单更新时间
      */

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

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class StorageListBo {
     /**
-     * Id
+     * 主键Id
      */
     private int id;
 

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

@@ -0,0 +1,49 @@
+package org.dromara.InventoryManagement.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.InventoryManagement.domain.InventorySheet;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 盘点单值对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InventorySheet.class)
+public class InventorySheetVo  extends BaseEntity {
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 编号
+     */
+    private String idSn;
+
+    /**
+     * 创建人
+     */
+    private Long adminId;
+
+    /**
+     * 盘点单状态
+     */
+    private Integer status;
+
+    /**
+     * 盘点数量
+     */
+    private int nums;
+
+    /**
+     * 删除时间
+     */
+    private Date deleteTime;
+
+
+}

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

@@ -11,7 +11,7 @@ import org.dromara.InventoryManagement.domain.PutInStorageType;
 @AutoMapper(target = PutInStorageType.class)
 public class PutInStorageTypeVo {
     /**
-     * ID
+     * 主键ID
      */
     private int ID;
     /**

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

@@ -23,7 +23,7 @@ public class StorageProductVo extends BaseEntity {
     private int productId;
 
     /**
-     * 仓库编号
+     * 入库类型
      */
     private int warehouseId;
 

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

@@ -1,6 +1,7 @@
 package org.dromara.InventoryManagement.domain.vo;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,15 +26,26 @@ public class StorageVo extends BaseEntity {
     private String code;
 
     /**
-     * 入库单状态
+     * 入库数总量
      */
-    private String status;
+    @TableField(value = "totalNums")
+    private double totalNums;
+
+    /**
+     * 入库单状态 0=未审核，1=待入库，2=审核未通过，3=已审核
+     */
+    private String status = "0";
 
     /**
      * 库区
      */
     private int partitionId;
 
+    /**
+     * 入库类型
+     */
+    private int warehouseId;
+
     /**
      * 备注
      */

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

@@ -0,0 +1,13 @@
+package org.dromara.InventoryManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.InventoryManagement.domain.InventorySheet;
+import org.dromara.InventoryManagement.domain.vo.InventorySheetVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 盘点单Mapper接口
+ */
+@Mapper
+public interface InventorySheetMapper extends BaseMapperPlus<InventorySheet, InventorySheetVo> {
+}

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

@@ -5,6 +5,8 @@ import org.dromara.InventoryManagement.domain.Storage;
 import org.dromara.InventoryManagement.domain.vo.StorageVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 
 @Mapper
 public interface PutInStorageMapper extends BaseMapperPlus<Storage, StorageVo> {

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

@@ -0,0 +1,33 @@
+package org.dromara.InventoryManagement.service;
+
+import org.dromara.InventoryManagement.domain.bo.InventorySheetBo;
+import org.dromara.InventoryManagement.domain.vo.InventorySheetVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 盘点单Service接口
+ */
+public interface InventorySheetService {
+    /**
+     * 分页查询盘点单管理
+     * @param inventorySheet 盘点单Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    TableDataInfo<InventorySheetVo> selectPageInventorySheetList(InventorySheetBo inventorySheet, PageQuery pageQuery);
+
+    /**
+     * 新增盘点单数据
+     * @param inventorySheet 盘点单Bo对象
+     * @return 影响行数
+     */
+    int insertInventorySheet(InventorySheetBo inventorySheet);
+
+    /**
+     * 删除盘点单数据
+     * @param inventorySheetIds 盘点单ID
+     * @return 影响行数
+     */
+    int deleteInventorySheetByIds(Long[] inventorySheetIds);
+}

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

@@ -10,11 +10,15 @@ import java.util.List;
 
 public interface PutInStorageService {
 
-    TableDataInfo<StorageVo> selectPutInStoragePageList(StorageBo storageBo, PageQuery pageQuery);
+    TableDataInfo<StorageVo> selectStoragePageList(StorageBo storageBo, PageQuery pageQuery);
 
     int insertStorage(PutInStorageBo putInStorageBo);
 
     int deleteById(List<Integer> ids);
 
     int updateStorage(PutInStorageBo putInStorageBo);
+
+    TableDataInfo<StorageVo> selectStorageProcessPageList(StorageBo storageBo, PageQuery pageQuery);
+
+    int updateStorageProcess(StorageBo storageBo);
 }

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

@@ -30,7 +30,7 @@ public class InventoryFlowServiceImpl implements InventoryFlowService {
     @Override
     public TableDataInfo<InventoryFlowVo> selectPageInventoryFlowList(InventoryFlowBo inventoryFlowBo, PageQuery pageQuery) {
         QueryWrapper<InventoryFlow> qw = new QueryWrapper<>();
-        qw.eq(StringUtils.isNotBlank(inventoryFlowBo.getName()),"name",inventoryFlowBo.getName());
+        qw.like(StringUtils.isNotBlank(inventoryFlowBo.getName()),"name",inventoryFlowBo.getName());
         Page<InventoryFlowVo> page= inventoryFlowMapper.selectVoPage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }

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

@@ -31,7 +31,7 @@ public class InventoryMonitoringServiceImpl implements InventoryMonitoringServic
     @Override
     public TableDataInfo<InventoryMonitoringVo> selectPageInventoryMonitoringList(InventoryMonitoringBo inventoryMonitoringBo, PageQuery pageQuery) {
         QueryWrapper<InventoryMonitoring> qw = new QueryWrapper<>();
-        qw.eq(StringUtils.isNotBlank(inventoryMonitoringBo.getName()),"name", inventoryMonitoringBo.getName());
+        qw.like(StringUtils.isNotBlank(inventoryMonitoringBo.getName()),"name", inventoryMonitoringBo.getName());
         Page<InventoryMonitoringVo> page=inventoryMonitoringMapper.selectVoPage(pageQuery.build(),qw);
         return TableDataInfo.build(page);
     }

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

@@ -0,0 +1,64 @@
+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.InventorySheet;
+import org.dromara.InventoryManagement.domain.bo.InventorySheetBo;
+import org.dromara.InventoryManagement.domain.vo.InventorySheetVo;
+import org.dromara.InventoryManagement.mapper.InventorySheetMapper;
+import org.dromara.InventoryManagement.service.InventorySheetService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.Arrays;
+
+/**
+ * 盘点单服务实现
+ */
+@Service
+@RequiredArgsConstructor
+public class InventorySheetServiceImpl implements InventorySheetService {
+    private final InventorySheetMapper inventorySheetMapper;
+
+    /**
+     * 根据InventorySheet对象分页查询盘点单数据
+     *
+     * @param inventorySheetBo   inventorySheetBo对象
+     * @param pageQuery 查询条件
+     * @return 分页结果
+     */
+    @Override
+    public TableDataInfo<InventorySheetVo> selectPageInventorySheetList(InventorySheetBo inventorySheetBo, PageQuery pageQuery) {
+        QueryWrapper<InventorySheet> qw = new QueryWrapper<>();
+        qw.like(StringUtils.isNotBlank(inventorySheetBo.getIdSn()), "id_sn", inventorySheetBo.getIdSn());
+        qw.like(inventorySheetBo.getStatus() != null, "status", inventorySheetBo.getStatus());
+        Page<InventorySheetVo> page=inventorySheetMapper.selectVoPage(pageQuery.build(),qw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 新增盘点单数据
+     *
+     * @param inventorySheetBo 盘点单Bo对象
+     * @return 结果
+     */
+    @Override
+    public int insertInventorySheet(InventorySheetBo inventorySheetBo) {
+        InventorySheet inventorySheet = MapstructUtils.convert(inventorySheetBo, InventorySheet.class);
+        return inventorySheetMapper.insert(inventorySheet);
+    }
+
+    /**
+     * 批量删除盘点单数据
+     * @param inventorySheetIds InventorySheetIds
+     * @return 结果
+     */
+    @Override
+    public int deleteInventorySheetByIds(Long[] inventorySheetIds) {
+        return inventorySheetMapper.deleteByIds(Arrays.asList(inventorySheetIds));
+    }
+}

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

@@ -2,6 +2,7 @@ package org.dromara.InventoryManagement.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import org.dromara.InventoryManagement.domain.Storage;
 import org.dromara.InventoryManagement.domain.StorageProduct;
@@ -38,7 +39,7 @@ public class PutInStorageServiceImpl implements PutInStorageService {
      * @return  结果
      */
     @Override
-    public TableDataInfo<StorageVo> selectPutInStoragePageList(StorageBo storageBo, PageQuery pageQuery) {
+    public TableDataInfo<StorageVo> selectStoragePageList(StorageBo storageBo, PageQuery pageQuery) {
         QueryWrapper<Storage> qw = new QueryWrapper<>();
         qw.like(StringUtils.isNotBlank(storageBo.getCode()), "code", storageBo.getCode());
         qw.eq(StringUtils.isNotBlank(storageBo.getStatus()), "status", storageBo.getStatus());
@@ -56,18 +57,24 @@ public class PutInStorageServiceImpl implements PutInStorageService {
     @Transactional(rollbackFor = Exception.class)
     public int insertStorage(PutInStorageBo putInStorageBo) {
         try {
+            double totalNumber = 0;
             // 生成订单编号
             OrderNumberGenerator generator = OrderNumberGenerator.getInstance();
             // 入库订单表注入
             Storage storage = newStorageMapstruct.toStorage(putInStorageBo, generator.generateOrderNumber("YKS"));
-            // 入库
-            putInStorageMapper.insert(storage);
+
             // 详情表注入
             for (StorageListBo storageListBo : putInStorageBo.getStorageList()){
+                // 获取总数量
+                totalNumber += storageListBo.getNums();
                 // 关联表注入
                 StorageProduct storageProduct = newStorageMapstruct.toStorageProduct(putInStorageBo,storageListBo,storage.getId());
                 putInStorageProductMapper.insert(storageProduct);
             }
+            // 总数量注入
+            storage.setTotalNums(totalNumber);
+            // 入库
+            putInStorageMapper.insert(storage);
             return 1;
         } catch (Exception e) {
             throw new RuntimeException("插入入库订单失败", e);
@@ -100,4 +107,32 @@ public class PutInStorageServiceImpl implements PutInStorageService {
         }
         return putInStorageMapper.updateById(newStorageMapstruct.toStorage(putInStorageBo, putInStorageBo.getInCode()));
     }
+
+    /**
+     * 查询入库审核信息分页列表
+     * @param storageBo 入库订单表
+     * @param pageQuery 分页信息
+     * @return 结果
+     */
+    @Override
+    public TableDataInfo<StorageVo> selectStorageProcessPageList(StorageBo storageBo, PageQuery pageQuery) {
+        QueryWrapper<Storage> qw = new QueryWrapper<>();
+        qw.like(StringUtils.isNotBlank(storageBo.getCode()), "code", storageBo.getCode());
+        qw.eq(StringUtils.isNotBlank(storageBo.getStatus()), "status", storageBo.getStatus());
+        qw.eq(storageBo.getWarehouseId() != 0, "warehouse_id", storageBo.getStatus());
+        Page<StorageVo> page = putInStorageMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 修改入库审核信息
+     * @param storageBo 入库订单表
+     * @return 结果
+     */
+    @Override
+    public int updateStorageProcess(StorageBo storageBo) {
+        Storage storage = MapstructUtils.convert(storageBo, Storage.class);
+        return putInStorageMapper.updateById(storage);
+    }
+
 }

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

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

@@ -4,5 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.InventoryManagement.mapper.PutInStorageMapper">
 
-
 </mapper>