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

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TFeesMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.basicData.mapper;
 
 import com.ruoyi.basicData.domain.TFees;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -12,6 +13,7 @@ import java.util.Map;
  * @author ruoyi
  * @date 2020-12-11
  */
+@Mapper
 public interface TFeesMapper {
     /**
      * 查询费用信息

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TWarehouseAreaMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.basicData.mapper;
 
 import com.ruoyi.basicData.domain.TWarehouseArea;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
@@ -12,6 +13,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2020-12-11
  */
+@Mapper
 public interface TWarehouseAreaMapper {
     /**
      * 查询库区

ruoyi-warehouse/src/main/java/com/ruoyi/finance/mapper/TFeeDoMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.finance.mapper;
 
 import com.ruoyi.finance.domain.TFeeDo;
 import com.ruoyi.finance.shipping.FinancialTFeeDoExcel;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -12,6 +13,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2021-01-18
  */
+@Mapper
 public interface TFeeDoMapper {
     /**
      * 查询财务数据明细

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/BillnoDelMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.warehouseBusiness.mapper;
 
 import com.ruoyi.warehouseBusiness.domain.BillnoDel;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
@@ -10,6 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2020-12-23
  */
+@Mapper
 public interface BillnoDelMapper {
     /**
      * 查询被删除的客户存货编号

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/BillnoSerialMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.warehouseBusiness.mapper;
 
 import com.ruoyi.warehouseBusiness.domain.BillnoSerial;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
@@ -10,6 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2020-12-23
  */
+@Mapper
 public interface BillnoSerialMapper {
     /**
      * 查询客户存货编号流水号

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TAnnexMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.warehouseBusiness.mapper;
 
 
 import com.ruoyi.warehouseBusiness.domain.TAnnex;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -12,6 +13,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2021-11-19
  */
+@Mapper
 public interface TAnnexMapper {
     /**
      * 查询业务附件

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TEnclosureMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.warehouseBusiness.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.warehouseBusiness.domain.TEnclosure;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
@@ -12,6 +13,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2020-12-11
  */
+@Mapper
 public interface TEnclosureMapper extends BaseMapper<TEnclosure> {
     /**
      * 查询附件

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseAgreementMapper.java

@@ -4,6 +4,7 @@ package com.ruoyi.warehouseBusiness.mapper;
 import com.ruoyi.basicData.domain.TGoods;
 import com.ruoyi.common.core.domain.entity.TWarehouse;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseAgreement;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.security.core.parameters.P;
 
@@ -16,6 +17,7 @@ import java.util.Map;
  * @author ruoyi
  * @date 2020-12-11
  */
+@Mapper
 public interface TWarehouseAgreementMapper {
     /**
      * 查询仓储费

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseAgreementitemsMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.warehouseBusiness.mapper;
 
 import com.ruoyi.warehouseBusiness.domain.TWarehouseAgreementitems;
 import com.ruoyi.warehouseBusiness.domain.dto.TWarehouseAgreementitem;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -14,6 +15,7 @@ import java.util.Map;
  * @author ruoyi
  * @date 2020-12-11
  */
+@Mapper
 public interface TWarehouseAgreementitemsMapper {
     /**
      * 查询仓储费明细表

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseBillsMapper.java

@@ -15,6 +15,7 @@ import com.ruoyi.warehouseBusiness.domain.dto.WarehousebillsDTO;
 import com.ruoyi.warehouseBusiness.domain.vo.WarehouseBillsVO;
 import com.ruoyi.warehouseBusiness.excel.CorpAnalysis;
 import com.ruoyi.warehouseBusiness.excel.StorageDetail;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
@@ -27,6 +28,7 @@ import java.util.Map;
  * @author ruoyi
  * @date 2020-12-11
  */
+@Mapper
 public interface TWarehouseBillsMapper extends BaseMapper<TWarehouseBills> {
     /**
      * 查询详情主表

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsCntrLoggerMapper.java

@@ -1,21 +1,23 @@
 package com.ruoyi.warehouseBusiness.mapper;
 
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsCntrLogger;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
  * 凯和订单从(修改记录)Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2021-07-05
  */
-public interface TWarehousebillsCntrLoggerMapper 
+@Mapper
+public interface TWarehousebillsCntrLoggerMapper
 {
     /**
      * 查询凯和订单从(修改记录)
-     * 
+     *
      * @param fId 凯和订单从(修改记录)ID
      * @return 凯和订单从(修改记录)
      */
@@ -23,7 +25,7 @@ public interface TWarehousebillsCntrLoggerMapper
 
     /**
      * 查询凯和订单从(修改记录)列表
-     * 
+     *
      * @param tWarehousebillsCntrLogger 凯和订单从(修改记录)
      * @return 凯和订单从(修改记录)集合
      */
@@ -31,7 +33,7 @@ public interface TWarehousebillsCntrLoggerMapper
 
     /**
      * 新增凯和订单从(修改记录)
-     * 
+     *
      * @param tWarehousebillsCntrLogger 凯和订单从(修改记录)
      * @return 结果
      */
@@ -39,7 +41,7 @@ public interface TWarehousebillsCntrLoggerMapper
 
     /**
      * 修改凯和订单从(修改记录)
-     * 
+     *
      * @param tWarehousebillsCntrLogger 凯和订单从(修改记录)
      * @return 结果
      */
@@ -47,7 +49,7 @@ public interface TWarehousebillsCntrLoggerMapper
 
     /**
      * 删除凯和订单从(修改记录)
-     * 
+     *
      * @param fId 凯和订单从(修改记录)ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TWarehousebillsCntrLoggerMapper
 
     /**
      * 批量删除凯和订单从(修改记录)
-     * 
+     *
      * @param fIds 需要删除的数据ID
      * @return 结果
      */

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsCntritemsLoggerMapper.java

@@ -1,21 +1,23 @@
 package com.ruoyi.warehouseBusiness.mapper;
 
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsCntritemsLogger;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
  * 凯和箱明细(修改记录)Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2021-07-05
  */
-public interface TWarehousebillsCntritemsLoggerMapper 
+@Mapper
+public interface TWarehousebillsCntritemsLoggerMapper
 {
     /**
      * 查询凯和箱明细(修改记录)
-     * 
+     *
      * @param fId 凯和箱明细(修改记录)ID
      * @return 凯和箱明细(修改记录)
      */
@@ -23,7 +25,7 @@ public interface TWarehousebillsCntritemsLoggerMapper
 
     /**
      * 查询凯和箱明细(修改记录)列表
-     * 
+     *
      * @param tWarehousebillsCntritemsLogger 凯和箱明细(修改记录)
      * @return 凯和箱明细(修改记录)集合
      */
@@ -31,7 +33,7 @@ public interface TWarehousebillsCntritemsLoggerMapper
 
     /**
      * 新增凯和箱明细(修改记录)
-     * 
+     *
      * @param tWarehousebillsCntritemsLogger 凯和箱明细(修改记录)
      * @return 结果
      */
@@ -39,7 +41,7 @@ public interface TWarehousebillsCntritemsLoggerMapper
 
     /**
      * 修改凯和箱明细(修改记录)
-     * 
+     *
      * @param tWarehousebillsCntritemsLogger 凯和箱明细(修改记录)
      * @return 结果
      */
@@ -47,7 +49,7 @@ public interface TWarehousebillsCntritemsLoggerMapper
 
     /**
      * 删除凯和箱明细(修改记录)
-     * 
+     *
      * @param fId 凯和箱明细(修改记录)ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TWarehousebillsCntritemsLoggerMapper
 
     /**
      * 批量删除凯和箱明细(修改记录)
-     * 
+     *
      * @param fIds 需要删除的数据ID
      * @return 结果
      */

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsLogMapper.java

@@ -2,20 +2,22 @@ package com.ruoyi.warehouseBusiness.mapper;
 
 
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsLog;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
 /**
  * 入出库状态Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2021-01-15
  */
-public interface TWarehousebillsLogMapper 
+@Mapper
+public interface TWarehousebillsLogMapper
 {
     /**
      * 查询入出库状态
-     * 
+     *
      * @param fId 入出库状态ID
      * @return 入出库状态
      */
@@ -23,7 +25,7 @@ public interface TWarehousebillsLogMapper
 
     /**
      * 查询入出库状态列表
-     * 
+     *
      * @param tWarehousebillsLog 入出库状态
      * @return 入出库状态集合
      */
@@ -31,7 +33,7 @@ public interface TWarehousebillsLogMapper
 
     /**
      * 新增入出库状态
-     * 
+     *
      * @param tWarehousebillsLog 入出库状态
      * @return 结果
      */
@@ -39,7 +41,7 @@ public interface TWarehousebillsLogMapper
 
     /**
      * 修改入出库状态
-     * 
+     *
      * @param tWarehousebillsLog 入出库状态
      * @return 结果
      */
@@ -47,7 +49,7 @@ public interface TWarehousebillsLogMapper
 
     /**
      * 删除入出库状态
-     * 
+     *
      * @param fId 入出库状态ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TWarehousebillsLogMapper
 
     /**
      * 批量删除入出库状态
-     * 
+     *
      * @param fIds 需要删除的数据ID
      * @return 结果
      */

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsLoggerMapper.java

@@ -1,21 +1,23 @@
 package com.ruoyi.warehouseBusiness.mapper;
 
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsLogger;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
  * 仓库主(修改记录)Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2021-07-05
  */
-public interface TWarehousebillsLoggerMapper 
+@Mapper
+public interface TWarehousebillsLoggerMapper
 {
     /**
      * 查询仓库主(修改记录)
-     * 
+     *
      * @param fId 仓库主(修改记录)ID
      * @return 仓库主(修改记录)
      */
@@ -23,7 +25,7 @@ public interface TWarehousebillsLoggerMapper
 
     /**
      * 查询仓库主(修改记录)列表
-     * 
+     *
      * @param tWarehousebillsLogger 仓库主(修改记录)
      * @return 仓库主(修改记录)集合
      */
@@ -31,7 +33,7 @@ public interface TWarehousebillsLoggerMapper
 
     /**
      * 新增仓库主(修改记录)
-     * 
+     *
      * @param tWarehousebillsLogger 仓库主(修改记录)
      * @return 结果
      */
@@ -39,7 +41,7 @@ public interface TWarehousebillsLoggerMapper
 
     /**
      * 修改仓库主(修改记录)
-     * 
+     *
      * @param tWarehousebillsLogger 仓库主(修改记录)
      * @return 结果
      */
@@ -47,7 +49,7 @@ public interface TWarehousebillsLoggerMapper
 
     /**
      * 删除仓库主(修改记录)
-     * 
+     *
      * @param fId 仓库主(修改记录)ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TWarehousebillsLoggerMapper
 
     /**
      * 批量删除仓库主(修改记录)
-     * 
+     *
      * @param fIds 需要删除的数据ID
      * @return 结果
      */

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsModifyMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.warehouseBusiness.mapper;
 
 
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsModify;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -12,6 +13,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2021-10-27
  */
+@Mapper
 public interface TWarehousebillsModifyMapper {
     /**
      * 查询仓库主(出入库)

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsfeesLoggerMapper.java

@@ -1,21 +1,23 @@
 package com.ruoyi.warehouseBusiness.mapper;
 
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfeesLogger;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
  * 仓库费用明细(修改记录)Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2021-07-05
  */
-public interface TWarehousebillsfeesLoggerMapper 
+@Mapper
+public interface TWarehousebillsfeesLoggerMapper
 {
     /**
      * 查询仓库费用明细(修改记录)
-     * 
+     *
      * @param fId 仓库费用明细(修改记录)ID
      * @return 仓库费用明细(修改记录)
      */
@@ -23,7 +25,7 @@ public interface TWarehousebillsfeesLoggerMapper
 
     /**
      * 查询仓库费用明细(修改记录)列表
-     * 
+     *
      * @param tWarehousebillsfeesLogger 仓库费用明细(修改记录)
      * @return 仓库费用明细(修改记录)集合
      */
@@ -31,7 +33,7 @@ public interface TWarehousebillsfeesLoggerMapper
 
     /**
      * 新增仓库费用明细(修改记录)
-     * 
+     *
      * @param tWarehousebillsfeesLogger 仓库费用明细(修改记录)
      * @return 结果
      */
@@ -39,7 +41,7 @@ public interface TWarehousebillsfeesLoggerMapper
 
     /**
      * 修改仓库费用明细(修改记录)
-     * 
+     *
      * @param tWarehousebillsfeesLogger 仓库费用明细(修改记录)
      * @return 结果
      */
@@ -47,7 +49,7 @@ public interface TWarehousebillsfeesLoggerMapper
 
     /**
      * 删除仓库费用明细(修改记录)
-     * 
+     *
      * @param fId 仓库费用明细(修改记录)ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TWarehousebillsfeesLoggerMapper
 
     /**
      * 批量删除仓库费用明细(修改记录)
-     * 
+     *
      * @param fIds 需要删除的数据ID
      * @return 结果
      */

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsfeesMapper.java

@@ -7,6 +7,7 @@ import com.ruoyi.shipping.domain.TAccount;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfees;
 import com.ruoyi.warehouseBusiness.excel.BillDetailsSubItem;
 import com.ruoyi.warehouseBusiness.excel.QueryMenu;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
@@ -19,6 +20,7 @@ import java.util.Map;
  * @author ruoyi
  * @date 2020-12-11
  */
+@Mapper
 public interface TWarehousebillsfeesMapper extends BaseMapper<TWarehousebillsfees> {
     /**
      * 查询仓库费用明细

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsfeesModifyMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.warehouseBusiness.mapper;
 
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfeesModify;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
@@ -10,6 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2021-10-27
  */
+@Mapper
 public interface TWarehousebillsfeesModifyMapper {
     /**
      * 查询仓库费用明细

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsitemsMapper.java

@@ -7,6 +7,7 @@ import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitems;
 import com.ruoyi.warehouseBusiness.domain.dto.WarehouseDTO;
 import com.ruoyi.warehouseBusiness.domain.vo.CalculateStorageFeesInfoVO;
 import com.ruoyi.warehouseBusiness.domain.vo.WarehouseTimeIntervalVO;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.security.core.parameters.P;
 
@@ -20,6 +21,7 @@ import java.util.Map;
  * @author ruoyi
  * @date 2020-12-11
  */
+@Mapper
 public interface TWarehousebillsitemsMapper extends BaseMapper<TWarehousebillsitems> {
     /**
      * 查询仓库明细从表

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsitemsNewMapper.java

@@ -1,10 +1,11 @@
 package com.ruoyi.warehouseBusiness.mapper;
 
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitemsNew;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 import java.util.Map;
-
+@Mapper
 public interface TWarehousebillsitemsNewMapper {
     public List<TWarehousebillsitemsNew> selectWarehouseBillItemsList(TWarehousebillsitemsNew tWarehousebillsitemsNew);