Merge branch 'master' of https://gitee.com/tearn/JSH_ERP

# Conflicts:
#	src/main/java/com/jsh/erp/service/app/AppService.java
#	src/main/java/com/jsh/erp/service/userBusiness/UserBusinessService.java

src/main/java/com/jsh/erp/controller/FunctionsController.java

@@ -2,7 +2,9 @@ package com.jsh.erp.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.constants.ExceptionConstants;
 import com.jsh.erp.datasource.entities.Functions;
+import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.service.functions.FunctionsService;
 import com.jsh.erp.service.userBusiness.UserBusinessService;
 import com.jsh.erp.utils.BaseResponseInfo;
@@ -275,4 +277,25 @@ public class FunctionsController {
         }
         return res;
     }
+    /**
+     * create by: qiankunpingtai
+     * website：http://39.105.146.63/symphony/
+     * description:
+     *  批量删除功能模块信息
+     * create time: 2019/3/29 11:15
+     * @Param: ids
+     * @return java.lang.Object
+     */
+    @RequestMapping(value = "/batchDeleteFunctionsByIds")
+    public Object batchDeleteFunctionsByIds(@RequestParam("ids") String ids) throws Exception {
+        JSONObject result = ExceptionConstants.standardSuccess();
+        int i= functionsService.batchDeleteFunctionsByIds(ids);
+        if(i<1){
+            logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
+                    ExceptionConstants.FUNCTIONS_DELETE_FAILED_CODE,ExceptionConstants.FUNCTIONS_DELETE_FAILED_MSG,ids);
+            throw new BusinessRunTimeException(ExceptionConstants.FUNCTIONS_DELETE_FAILED_CODE,
+                    ExceptionConstants.FUNCTIONS_DELETE_FAILED_MSG);
+        }
+        return result;
+    }
 }

src/main/java/com/jsh/erp/controller/InOutItemController.java

@@ -2,7 +2,9 @@ package com.jsh.erp.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.constants.ExceptionConstants;
 import com.jsh.erp.datasource.entities.InOutItem;
+import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.service.inOutItem.InOutItemService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import org.slf4j.Logger;
@@ -54,5 +56,26 @@ public class InOutItemController {
         }
         return res;
     }
+    /**
+     * create by: qiankunpingtai
+     * website：http://39.105.146.63/symphony/
+     * description:
+     *  批量删除收支项目信息
+     * create time: 2019/3/29 11:15
+     * @Param: ids
+     * @return java.lang.Object
+     */
+    @RequestMapping(value = "/batchDeleteInOutItemByIds")
+    public Object batchDeleteInOutItemByIds(@RequestParam("ids") String ids) throws Exception {
+        JSONObject result = ExceptionConstants.standardSuccess();
+        int i= inOutItemService.batchDeleteInOutItemByIds(ids);
+        if(i<1){
+            logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
+                    ExceptionConstants.IN_OUT_ITEM_DELETE_FAILED_CODE,ExceptionConstants.IN_OUT_ITEM_DELETE_FAILED_MSG,ids);
+            throw new BusinessRunTimeException(ExceptionConstants.IN_OUT_ITEM_DELETE_FAILED_CODE,
+                    ExceptionConstants.IN_OUT_ITEM_DELETE_FAILED_MSG);
+        }
+        return result;
+    }
 
 }

src/main/java/com/jsh/erp/controller/MaterialController.java

@@ -6,9 +6,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.jsh.erp.constants.BusinessConstants;
+import com.jsh.erp.constants.ExceptionConstants;
 import com.jsh.erp.datasource.entities.DepotEx;
 import com.jsh.erp.datasource.entities.Material;
 import com.jsh.erp.datasource.entities.MaterialVo4Unit;
+import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.service.material.MaterialService;
 import com.jsh.erp.utils.*;
 import jxl.Sheet;
@@ -341,4 +343,25 @@ public class MaterialController {
         queryInfo.setTotal(pageInfo.getTotal());
         return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
     }
+    /**
+     * create by: qiankunpingtai
+     * website：http://39.105.146.63/symphony/
+     * description:
+     *  批量删除商品信息
+     * create time: 2019/3/29 11:15
+     * @Param: ids
+     * @return java.lang.Object
+     */
+    @RequestMapping(value = "/batchDeleteMaterialByIds")
+    public Object batchDeleteMaterialByIds(@RequestParam("ids") String ids) throws Exception {
+        JSONObject result = ExceptionConstants.standardSuccess();
+        int i= materialService.batchDeleteMaterialByIds(ids);
+        if(i<1){
+            logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
+                    ExceptionConstants.MATERIAL_DELETE_FAILED_CODE,ExceptionConstants.MATERIAL_DELETE_FAILED_MSG,ids);
+            throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_DELETE_FAILED_CODE,
+                    ExceptionConstants.MATERIAL_DELETE_FAILED_MSG);
+        }
+        return result;
+    }
 }

src/main/java/com/jsh/erp/controller/MaterialPropertyController.java

+package com.jsh.erp.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.constants.ExceptionConstants;
+import com.jsh.erp.exception.BusinessRunTimeException;
+import com.jsh.erp.service.material.MaterialService;
+import com.jsh.erp.service.materialProperty.MaterialPropertyService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * Description
+ *
+ * @Author: qiankunpingtai
+ * @Date: 2019/3/29 15:24
+ */
+@RestController
+@RequestMapping(value = "/materialProperty")
+public class MaterialPropertyController {
+    private Logger logger = LoggerFactory.getLogger(MaterialPropertyController.class);
+    @Resource
+    private MaterialPropertyService materialPropertyService;
+    /**
+     * create by: qiankunpingtai
+     * website：http://39.105.146.63/symphony/
+     * description:
+     *  批量删除商品扩展信息
+     * create time: 2019/3/29 11:15
+     * @Param: ids
+     * @return java.lang.Object
+     */
+    @RequestMapping(value = "/batchDeleteMaterialPropertyByIds")
+    public Object batchDeleteMaterialPropertyByIds(@RequestParam("ids") String ids) throws Exception {
+        JSONObject result = ExceptionConstants.standardSuccess();
+        int i= materialPropertyService.batchDeleteMaterialPropertyByIds(ids);
+        if(i<1){
+            logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
+                    ExceptionConstants.MATERIAL_PROPERTY_DELETE_FAILED_CODE,ExceptionConstants.MATERIAL_PROPERTY_DELETE_FAILED_MSG,ids);
+            throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_PROPERTY_DELETE_FAILED_CODE,
+                    ExceptionConstants.MATERIAL_PROPERTY_DELETE_FAILED_MSG);
+        }
+        return result;
+    }
+}

src/main/java/com/jsh/erp/controller/PersonController.java

@@ -2,7 +2,9 @@ package com.jsh.erp.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.constants.ExceptionConstants;
 import com.jsh.erp.datasource.entities.Person;
+import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.service.person.PersonService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import org.slf4j.Logger;
@@ -121,4 +123,25 @@ public class PersonController {
         }
         return dataArray;
     }
+    /**
+     * create by: qiankunpingtai
+     * website：http://39.105.146.63/symphony/
+     * description:
+     *  批量删除经手人信息
+     * create time: 2019/3/29 11:15
+     * @Param: ids
+     * @return java.lang.Object
+     */
+    @RequestMapping(value = "/batchDeletePersonByIds")
+    public Object batchDeletePersonByIds(@RequestParam("ids") String ids) throws Exception {
+        JSONObject result = ExceptionConstants.standardSuccess();
+        int i= personService.batchDeletePersonByIds(ids);
+        if(i<1){
+            logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
+                    ExceptionConstants.PERSON_DELETE_FAILED_CODE,ExceptionConstants.PERSON_DELETE_FAILED_MSG,ids);
+            throw new BusinessRunTimeException(ExceptionConstants.PERSON_DELETE_FAILED_CODE,
+                    ExceptionConstants.PERSON_DELETE_FAILED_MSG);
+        }
+        return result;
+    }
 }

src/main/java/com/jsh/erp/controller/RoleController.java

@@ -2,8 +2,11 @@ package com.jsh.erp.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.constants.ExceptionConstants;
 import com.jsh.erp.datasource.entities.Role;
+import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.service.role.RoleService;
+import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.service.userBusiness.UserBusinessService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -77,4 +80,26 @@ public class RoleController {
         return roleService.getRole();
     }
 
+    /**
+     * create by: qiankunpingtai
+     * website：http://39.105.146.63/symphony/
+     * description:
+     *  逻辑删除角色信息
+     * create time: 2019/3/28 15:39
+     * @Param: ids
+     * @return java.lang.Object
+     */
+    @RequestMapping(value = "/batchDeleteRoleByIds")
+    public Object batchDeleteRoleByIds(@RequestParam("ids") String ids) throws Exception {
+        JSONObject result = ExceptionConstants.standardSuccess();
+        int i= roleService.batchDeleteRoleByIds(ids);
+        if(i<1){
+            logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
+                    ExceptionConstants.ROLE_DELETE_FAILED_CODE,ExceptionConstants.ROLE_DELETE_FAILED_MSG,ids);
+            throw new BusinessRunTimeException(ExceptionConstants.ROLE_DELETE_FAILED_CODE,
+                    ExceptionConstants.ROLE_DELETE_FAILED_MSG);
+        }
+        return result;
+    }
+
 }

src/main/java/com/jsh/erp/controller/SupplierController.java

@@ -2,8 +2,11 @@ package com.jsh.erp.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.constants.ExceptionConstants;
 import com.jsh.erp.datasource.entities.Supplier;
+import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.service.supplier.SupplierService;
+import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.service.userBusiness.UserBusinessService;
 import com.jsh.erp.utils.*;
 import jxl.Sheet;
@@ -40,6 +43,8 @@ public class SupplierController {
 
     @Resource
     private UserBusinessService userBusinessService;
+    @Resource
+    private UserService userService;
 
     /**
      * 更新供应商-只更新预付款，其余用原来的值
@@ -437,5 +442,26 @@ public class SupplierController {
             return null;
         }
     }
+    /**
+     * create by: qiankunpingtai
+     * website：http://39.105.146.63/symphony/
+     * description:
+     *  批量删除供应商信息
+     * create time: 2019/3/29 11:15
+     * @Param: ids
+     * @return java.lang.Object
+     */
+    @RequestMapping(value = "/batchDeleteSupplierByIds")
+    public Object batchDeleteSupplierByIds(@RequestParam("ids") String ids) throws Exception {
+        JSONObject result = ExceptionConstants.standardSuccess();
+        int i= supplierService.batchDeleteSupplierByIds(ids);
+        if(i<1){
+            logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
+                    ExceptionConstants.SUPPLIER_DELETE_FAILED_CODE,ExceptionConstants.SUPPLIER_DELETE_FAILED_MSG,ids);
+            throw new BusinessRunTimeException(ExceptionConstants.SUPPLIER_DELETE_FAILED_CODE,
+                    ExceptionConstants.SUPPLIER_DELETE_FAILED_MSG);
+        }
+        return result;
+    }
 
 }

src/main/java/com/jsh/erp/controller/SystemConfigController.java

+package com.jsh.erp.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.constants.ExceptionConstants;
+import com.jsh.erp.exception.BusinessRunTimeException;
+import com.jsh.erp.service.systemConfig.SystemConfigService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * Description
+ *
+ * @Author: qiankunpingtai
+ * @Date: 2019/4/1 15:28
+ */
+@RestController
+@RequestMapping(value = "/systemConfig")
+public class SystemConfigController {
+    private Logger logger = LoggerFactory.getLogger(SystemConfigController.class);
+    @Resource
+    private SystemConfigService systemConfigService;
+    /**
+     * create by: qiankunpingtai
+     * website：http://39.105.146.63/symphony/
+     * description:
+     *  批量删除系统配置信息
+     * create time: 2019/3/29 11:15
+     * @Param: ids
+     * @return java.lang.Object
+     */
+    @RequestMapping(value = "/batchDeleteSystemConfigByIds")
+    public Object batchDeleteSystemConfigByIds(@RequestParam("ids") String ids) throws Exception {
+        JSONObject result = ExceptionConstants.standardSuccess();
+        int i= systemConfigService.batchDeleteSystemConfigByIds(ids);
+        if(i<1){
+            logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
+                    ExceptionConstants.SYSTEM_CONFIG_DELETE_FAILED_CODE,ExceptionConstants.SYSTEM_CONFIG_DELETE_FAILED_MSG,ids);
+            throw new BusinessRunTimeException(ExceptionConstants.SYSTEM_CONFIG_DELETE_FAILED_CODE,
+                    ExceptionConstants.SYSTEM_CONFIG_DELETE_FAILED_MSG);
+        }
+        return result;
+    }
+
+}

src/main/java/com/jsh/erp/controller/UnitController.java

+package com.jsh.erp.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.constants.ExceptionConstants;
+import com.jsh.erp.exception.BusinessRunTimeException;
+import com.jsh.erp.service.unit.UnitService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * Description
+ *
+ * @Author: qiankunpingtai
+ * @Date: 2019/4/1 15:38
+ */
+@RestController
+@RequestMapping(value = "/unit")
+public class UnitController {
+    private Logger logger = LoggerFactory.getLogger(UnitController.class);
+    @Resource
+    private UnitService unitService;
+    /**
+     * create by: qiankunpingtai
+     * website：http://39.105.146.63/symphony/
+     * description:
+     *  批量删除系统配置信息
+     * create time: 2019/3/29 11:15
+     * @Param: ids
+     * @return java.lang.Object
+     */
+    @RequestMapping(value = "/batchDeleteUnitByIds")
+    public Object batchDeleteUnitByIds(@RequestParam("ids") String ids) throws Exception {
+        JSONObject result = ExceptionConstants.standardSuccess();
+        int i= unitService.batchDeleteUnitByIds(ids);
+        if(i<1){
+            logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
+                    ExceptionConstants.UNIT_DELETE_FAILED_CODE,ExceptionConstants.UNIT_DELETE_FAILED_MSG,ids);
+            throw new BusinessRunTimeException(ExceptionConstants.UNIT_DELETE_FAILED_CODE,
+                    ExceptionConstants.UNIT_DELETE_FAILED_MSG);
+        }
+        return result;
+    }
+}

src/main/java/com/jsh/erp/controller/UserBusinessController.java

 package com.jsh.erp.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.constants.ExceptionConstants;
 import com.jsh.erp.datasource.entities.UserBusiness;
+import com.jsh.erp.exception.BusinessRunTimeException;
+import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.service.userBusiness.UserBusinessService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import com.jsh.erp.utils.ErpInfo;
@@ -27,6 +30,8 @@ public class UserBusinessController {
 
     @Resource
     private UserBusinessService userBusinessService;
+    @Resource
+    private UserService userService;
 
     @GetMapping(value = "/getBasicData")
     public BaseResponseInfo getBasicData(@RequestParam(value = "KeyId") String keyId,
@@ -86,4 +91,26 @@ public class UserBusinessController {
         }
         return res;
     }
+    /**
+     * create by: qiankunpingtai
+     * website：http://39.105.146.63/symphony/
+     * description:
+     *  批量删除用户角色模块关系信息
+     * create time: 2019/3/28 15:47
+     * @Param: ids
+     * @return java.lang.Object
+     */
+    @RequestMapping(value = "/batchDeleteUserBusinessByIds")
+    public Object batchDeleteUserBusinessByIds(@RequestParam("ids") String ids) throws Exception {
+
+        JSONObject result = ExceptionConstants.standardSuccess();
+        int i= userBusinessService.batchDeleteUserBusinessByIds(ids);
+        if(i<1){
+            logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
+                    ExceptionConstants.USER_BUSINESS_DELETE_FAILED_CODE,ExceptionConstants.USER_BUSINESS_DELETE_FAILED_MSG,ids);
+            throw new BusinessRunTimeException(ExceptionConstants.USER_BUSINESS_DELETE_FAILED_CODE,
+                    ExceptionConstants.USER_BUSINESS_DELETE_FAILED_MSG);
+        }
+        return result;
+    }
 }

src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java

@@ -6,6 +6,7 @@ import com.jsh.erp.datasource.entities.AccountHeadVo4ListEx;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 public interface AccountHeadMapperEx {
@@ -34,4 +35,6 @@ public interface AccountHeadMapperEx {
 
     List<AccountHeadVo4ListEx> getDetailByNumber(
             @Param("billNo") String billNo);
+
+    int batchDeleteAccountHeadByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapperEx.java

@@ -5,6 +5,7 @@ import com.jsh.erp.datasource.entities.AccountItemExample;
 import com.jsh.erp.datasource.vo.AccountItemVo4List;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 public interface AccountItemMapperEx {
@@ -24,4 +25,5 @@ public interface AccountItemMapperEx {
     List<AccountItemVo4List> getDetailList(
             @Param("headerId") Long headerId);
 
+    int batchDeleteAccountItemByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java

@@ -6,6 +6,7 @@ import com.jsh.erp.datasource.vo.AccountVo4InOutList;
 import com.jsh.erp.datasource.vo.AccountVo4List;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 public interface AccountMapperEx {
@@ -29,4 +30,6 @@ public interface AccountMapperEx {
 
     int findAccountInOutListCount(
             @Param("accountId") Long accountId);
+
+    int batchDeleteAccountByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/AppMapperEx.java

@@ -4,6 +4,7 @@ import com.jsh.erp.datasource.entities.App;
 import com.jsh.erp.datasource.entities.AppExample;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 public interface AppMapperEx {
@@ -17,4 +18,6 @@ public interface AppMapperEx {
     Long countsByApp(
             @Param("name") String name,
             @Param("type") String type);
+
+    int batchDeleteAppByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java

@@ -8,6 +8,7 @@ import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -112,4 +113,6 @@ public interface DepotHeadMapperEx {
      * 获得一个全局唯一的数作为订单号的追加
      * */
      Long  getBuildOnlyNumber(@Param("seq_name") String seq_name);
+
+    int batchDeleteDepotHeadByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
 }

src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java

@@ -4,6 +4,7 @@ import com.jsh.erp.datasource.entities.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -143,6 +144,14 @@ public interface DepotItemMapperEx {
                                                     @Param("enableSerialNumber")String enableSerialNumber);
      /**
       * 根据单据主表id删除单据子表数据
+      * 物理删除，已弃用
       * */
+     @Deprecated
      int deleteDepotItemByDepotHeadIds(@Param("depotheadIds")Long []depotHeadIds);
+     /**
+      * 根据单据主表id删除单据子表数据
+      * */
+     int batchDeleteDepotItemByDepotHeadIds(@Param("depotheadIds")Long []depotHeadIds);
+
+    int batchDeleteDepotItemByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
 }

src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java

@@ -5,6 +5,7 @@ import com.jsh.erp.datasource.entities.DepotEx;
 import com.jsh.erp.datasource.entities.DepotExample;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -23,4 +24,6 @@ public interface DepotMapperEx {
             @Param("remark") String remark);
 
     List<DepotEx> getDepotList(Map<String, Object> params);
+
+    int batchDeleteDepotByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/FunctionsMapperEx.java

@@ -4,6 +4,7 @@ import com.jsh.erp.datasource.entities.Functions;
 import com.jsh.erp.datasource.entities.FunctionsExample;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 public interface FunctionsMapperEx {
@@ -17,4 +18,6 @@ public interface FunctionsMapperEx {
     Long countsByFunctions(
             @Param("name") String name,
             @Param("type") String type);
+
+    int batchDeleteFunctionsByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/InOutItemMapperEx.java

@@ -4,6 +4,7 @@ import com.jsh.erp.datasource.entities.InOutItem;
 import com.jsh.erp.datasource.entities.InOutItemExample;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 public interface InOutItemMapperEx {
@@ -19,4 +20,6 @@ public interface InOutItemMapperEx {
             @Param("name") String name,
             @Param("type") String type,
             @Param("remark") String remark);
+
+    int batchDeleteInOutItemByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java

@@ -4,6 +4,7 @@ import com.jsh.erp.datasource.entities.Material;
 import com.jsh.erp.datasource.entities.MaterialVo4Unit;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -54,4 +55,6 @@ public interface MaterialMapperEx {
      * 获取开启序列号并且状态正常的商品列表
      * */
     List<Material> getMaterialEnableSerialNumberList(Map<String, Object> parameterMap);
+
+    int batchDeleteMaterialByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
 }