diff --git a/pom.xml b/pom.xml index 7ff1dff3..b3030a0d 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ repackage - com.wansensoft.erp.ErpApplication + com.wansensoft.ErpApplication diff --git a/src/main/java/com/wansensoft/erp/ErpApplication.java b/src/main/java/com/wansensoft/ErpApplication.java similarity index 88% rename from src/main/java/com/wansensoft/erp/ErpApplication.java rename to src/main/java/com/wansensoft/ErpApplication.java index 451df396..2b489275 100644 --- a/src/main/java/com/wansensoft/erp/ErpApplication.java +++ b/src/main/java/com/wansensoft/ErpApplication.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp; +package com.wansensoft; -import com.wansensoft.erp.utils.ComputerInfo; +import com.wansensoft.utils.ComputerInfo; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -12,7 +12,7 @@ import java.io.IOException; @SpringBootApplication -@MapperScan(basePackages = {"com.wansensoft.erp.datasource.mappers"}) +@MapperScan(basePackages = {"com.wansensoft.datasource.mappers"}) @ServletComponentScan @EnableScheduling public class ErpApplication{ diff --git a/src/main/java/com/wansensoft/erp/config/Swagger2Config.java b/src/main/java/com/wansensoft/config/Swagger2Config.java similarity index 97% rename from src/main/java/com/wansensoft/erp/config/Swagger2Config.java rename to src/main/java/com/wansensoft/config/Swagger2Config.java index efeadcc9..13369860 100644 --- a/src/main/java/com/wansensoft/erp/config/Swagger2Config.java +++ b/src/main/java/com/wansensoft/config/Swagger2Config.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.config; +package com.wansensoft.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/wansensoft/erp/config/TenantConfig.java b/src/main/java/com/wansensoft/config/TenantConfig.java similarity index 86% rename from src/main/java/com/wansensoft/erp/config/TenantConfig.java rename to src/main/java/com/wansensoft/config/TenantConfig.java index a763b9f1..68be6848 100644 --- a/src/main/java/com/wansensoft/erp/config/TenantConfig.java +++ b/src/main/java/com/wansensoft/config/TenantConfig.java @@ -1,20 +1,8 @@ -package com.wansensoft.erp.config; +package com.wansensoft.config; -import com.baomidou.mybatisplus.core.parser.ISqlParser; -import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; -import com.baomidou.mybatisplus.core.plugins.*; -import com.wansensoft.erp.utils.Tools; -import jakarta.servlet.http.HttpServletRequest; -import net.sf.jsqlparser.expression.Expression; -import net.sf.jsqlparser.expression.LongValue; -import org.apache.ibatis.mapping.MappedStatement; -import org.apache.ibatis.reflection.MetaObject; import org.mybatis.spring.mapper.MapperScannerConfigurer; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; @Service public class TenantConfig { diff --git a/src/main/java/com/wansensoft/erp/constants/BusinessConstants.java b/src/main/java/com/wansensoft/constants/BusinessConstants.java similarity index 99% rename from src/main/java/com/wansensoft/erp/constants/BusinessConstants.java rename to src/main/java/com/wansensoft/constants/BusinessConstants.java index f218bfb3..1490b4dd 100644 --- a/src/main/java/com/wansensoft/erp/constants/BusinessConstants.java +++ b/src/main/java/com/wansensoft/constants/BusinessConstants.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.constants; +package com.wansensoft.constants; /** * @ClassName:BusinessConstants diff --git a/src/main/java/com/wansensoft/erp/constants/ExceptionConstants.java b/src/main/java/com/wansensoft/constants/ExceptionConstants.java similarity index 99% rename from src/main/java/com/wansensoft/erp/constants/ExceptionConstants.java rename to src/main/java/com/wansensoft/constants/ExceptionConstants.java index 02c72dac..e24d99f5 100644 --- a/src/main/java/com/wansensoft/erp/constants/ExceptionConstants.java +++ b/src/main/java/com/wansensoft/constants/ExceptionConstants.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.constants; +package com.wansensoft.constants; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/wansensoft/erp/controller/AccountController.java b/src/main/java/com/wansensoft/controller/AccountController.java similarity index 94% rename from src/main/java/com/wansensoft/erp/controller/AccountController.java rename to src/main/java/com/wansensoft/controller/AccountController.java index bc1a1292..dd02dd5e 100644 --- a/src/main/java/com/wansensoft/erp/controller/AccountController.java +++ b/src/main/java/com/wansensoft/controller/AccountController.java @@ -1,14 +1,14 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.datasource.entities.Account; -import com.wansensoft.erp.datasource.vo.AccountVo4InOutList; -import com.wansensoft.erp.service.account.AccountService; -import com.wansensoft.erp.service.systemConfig.SystemConfigService; -import com.wansensoft.erp.utils.BaseResponseInfo; -import com.wansensoft.erp.utils.ErpInfo; -import com.wansensoft.erp.utils.ResponseJsonUtil; +import com.wansensoft.datasource.entities.Account; +import com.wansensoft.datasource.vo.AccountVo4InOutList; +import com.wansensoft.service.account.AccountService; +import com.wansensoft.service.systemConfig.SystemConfigService; +import com.wansensoft.utils.BaseResponseInfo; +import com.wansensoft.utils.ErpInfo; +import com.wansensoft.utils.ResponseJsonUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/controller/AccountHeadController.java b/src/main/java/com/wansensoft/controller/AccountHeadController.java similarity index 90% rename from src/main/java/com/wansensoft/erp/controller/AccountHeadController.java rename to src/main/java/com/wansensoft/controller/AccountHeadController.java index 0bb0075f..bfdc125b 100644 --- a/src/main/java/com/wansensoft/erp/controller/AccountHeadController.java +++ b/src/main/java/com/wansensoft/controller/AccountHeadController.java @@ -1,14 +1,14 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.AccountHead; -import com.wansensoft.erp.datasource.entities.AccountHeadVo4Body; -import com.wansensoft.erp.datasource.entities.AccountHeadVo4ListEx; -import com.wansensoft.erp.service.accountHead.AccountHeadService; -import com.wansensoft.erp.utils.BaseResponseInfo; -import com.wansensoft.erp.utils.ErpInfo; -import com.wansensoft.erp.utils.ResponseJsonUtil; +import com.wansensoft.datasource.entities.AccountHead; +import com.wansensoft.datasource.entities.AccountHeadVo4Body; +import com.wansensoft.datasource.entities.AccountHeadVo4ListEx; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.service.accountHead.AccountHeadService; +import com.wansensoft.utils.BaseResponseInfo; +import com.wansensoft.utils.ErpInfo; +import com.wansensoft.utils.ResponseJsonUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/AccountItemController.java b/src/main/java/com/wansensoft/controller/AccountItemController.java similarity index 90% rename from src/main/java/com/wansensoft/erp/controller/AccountItemController.java rename to src/main/java/com/wansensoft/controller/AccountItemController.java index 3b9cdd50..6ff64980 100644 --- a/src/main/java/com/wansensoft/erp/controller/AccountItemController.java +++ b/src/main/java/com/wansensoft/controller/AccountItemController.java @@ -1,13 +1,13 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.datasource.vo.AccountItemVo4List; -import com.wansensoft.erp.service.accountHead.AccountHeadService; -import com.wansensoft.erp.service.accountItem.AccountItemService; -import com.wansensoft.erp.utils.BaseResponseInfo; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.datasource.vo.AccountItemVo4List; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.service.accountHead.AccountHeadService; +import com.wansensoft.service.accountItem.AccountItemService; +import com.wansensoft.utils.BaseResponseInfo; +import com.wansensoft.utils.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/DepotController.java b/src/main/java/com/wansensoft/controller/DepotController.java similarity index 92% rename from src/main/java/com/wansensoft/erp/controller/DepotController.java rename to src/main/java/com/wansensoft/controller/DepotController.java index c0905e12..4b88d39a 100644 --- a/src/main/java/com/wansensoft/erp/controller/DepotController.java +++ b/src/main/java/com/wansensoft/controller/DepotController.java @@ -1,17 +1,16 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.datasource.entities.Depot; -import com.wansensoft.erp.datasource.entities.DepotEx; -import com.wansensoft.erp.datasource.entities.MaterialInitialStock; -import com.wansensoft.erp.service.depot.DepotService; -import com.wansensoft.erp.service.material.MaterialService; -import com.wansensoft.erp.service.userBusiness.UserBusinessService; -import com.wansensoft.erp.utils.*; -import com.wansensoft.erp.utils.BaseResponseInfo; -import com.wansensoft.erp.utils.ErpInfo; -import com.wansensoft.erp.utils.ResponseJsonUtil; +import com.wansensoft.datasource.entities.Depot; +import com.wansensoft.datasource.entities.DepotEx; +import com.wansensoft.datasource.entities.MaterialInitialStock; +import com.wansensoft.service.depot.DepotService; +import com.wansensoft.service.material.MaterialService; +import com.wansensoft.service.userBusiness.UserBusinessService; +import com.wansensoft.utils.BaseResponseInfo; +import com.wansensoft.utils.ErpInfo; +import com.wansensoft.utils.ResponseJsonUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/DepotHeadController.java b/src/main/java/com/wansensoft/controller/DepotHeadController.java similarity index 96% rename from src/main/java/com/wansensoft/erp/controller/DepotHeadController.java rename to src/main/java/com/wansensoft/controller/DepotHeadController.java index f82d4db6..0773d067 100644 --- a/src/main/java/com/wansensoft/erp/controller/DepotHeadController.java +++ b/src/main/java/com/wansensoft/controller/DepotHeadController.java @@ -1,20 +1,20 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.DepotHead; -import com.wansensoft.erp.datasource.entities.DepotHeadVo4Body; -import com.wansensoft.erp.datasource.vo.DepotHeadVo4InDetail; -import com.wansensoft.erp.datasource.vo.DepotHeadVo4InOutMCount; -import com.wansensoft.erp.datasource.vo.DepotHeadVo4List; -import com.wansensoft.erp.datasource.vo.DepotHeadVo4StatementAccount; -import com.wansensoft.erp.service.depot.DepotService; -import com.wansensoft.erp.service.depotHead.DepotHeadService; -import com.wansensoft.erp.service.redis.RedisService; -import com.wansensoft.erp.service.systemConfig.SystemConfigService; -import com.wansensoft.erp.utils.*; +import com.wansensoft.datasource.entities.DepotHead; +import com.wansensoft.datasource.entities.DepotHeadVo4Body; +import com.wansensoft.datasource.vo.DepotHeadVo4InDetail; +import com.wansensoft.datasource.vo.DepotHeadVo4InOutMCount; +import com.wansensoft.datasource.vo.DepotHeadVo4List; +import com.wansensoft.datasource.vo.DepotHeadVo4StatementAccount; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.service.depot.DepotService; +import com.wansensoft.service.depotHead.DepotHeadService; +import com.wansensoft.service.redis.RedisService; +import com.wansensoft.service.systemConfig.SystemConfigService; +import com.wansensoft.utils.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/DepotItemController.java b/src/main/java/com/wansensoft/controller/DepotItemController.java similarity index 97% rename from src/main/java/com/wansensoft/erp/controller/DepotItemController.java rename to src/main/java/com/wansensoft/controller/DepotItemController.java index 88fa3fad..4359b78f 100644 --- a/src/main/java/com/wansensoft/erp/controller/DepotItemController.java +++ b/src/main/java/com/wansensoft/controller/DepotItemController.java @@ -1,26 +1,22 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.*; -import com.wansensoft.erp.datasource.vo.DepotItemStockWarningCount; -import com.wansensoft.erp.datasource.vo.DepotItemVoBatchNumberList; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.service.depot.DepotService; -import com.wansensoft.erp.service.depotHead.DepotHeadService; -import com.wansensoft.erp.service.depotItem.DepotItemService; -import com.wansensoft.erp.service.material.MaterialService; -import com.wansensoft.erp.service.role.RoleService; -import com.wansensoft.erp.service.systemConfig.SystemConfigService; -import com.wansensoft.erp.service.unit.UnitService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.*; -import com.wansensoft.erp.datasource.entities.*; -import com.wansensoft.erp.utils.*; -import com.wansensoft.erp.datasource.entities.*; -import com.wansensoft.erp.utils.*; +import com.wansensoft.datasource.entities.*; +import com.wansensoft.datasource.vo.DepotItemStockWarningCount; +import com.wansensoft.datasource.vo.DepotItemVoBatchNumberList; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.service.depot.DepotService; +import com.wansensoft.service.depotHead.DepotHeadService; +import com.wansensoft.service.depotItem.DepotItemService; +import com.wansensoft.service.material.MaterialService; +import com.wansensoft.service.role.RoleService; +import com.wansensoft.service.systemConfig.SystemConfigService; +import com.wansensoft.service.unit.UnitService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import jxl.Sheet; diff --git a/src/main/java/com/wansensoft/erp/controller/FunctionController.java b/src/main/java/com/wansensoft/controller/FunctionController.java similarity index 94% rename from src/main/java/com/wansensoft/erp/controller/FunctionController.java rename to src/main/java/com/wansensoft/controller/FunctionController.java index f10fe1d2..03f9bc9c 100644 --- a/src/main/java/com/wansensoft/erp/controller/FunctionController.java +++ b/src/main/java/com/wansensoft/controller/FunctionController.java @@ -1,18 +1,18 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.datasource.entities.Function; -import com.wansensoft.erp.datasource.entities.SystemConfig; -import com.wansensoft.erp.datasource.entities.UserBusiness; -import com.wansensoft.erp.service.functions.FunctionService; -import com.wansensoft.erp.service.systemConfig.SystemConfigService; -import com.wansensoft.erp.service.userBusiness.UserBusinessService; -import com.wansensoft.erp.utils.BaseResponseInfo; -import com.wansensoft.erp.utils.ErpInfo; -import com.wansensoft.erp.utils.StringUtil; -import com.wansensoft.erp.utils.Tools; -import com.wansensoft.erp.utils.*; +import com.wansensoft.datasource.entities.Function; +import com.wansensoft.datasource.entities.SystemConfig; +import com.wansensoft.datasource.entities.UserBusiness; +import com.wansensoft.service.functions.FunctionService; +import com.wansensoft.service.systemConfig.SystemConfigService; +import com.wansensoft.service.userBusiness.UserBusinessService; +import com.wansensoft.utils.BaseResponseInfo; +import com.wansensoft.utils.ErpInfo; +import com.wansensoft.utils.StringUtil; +import com.wansensoft.utils.Tools; +import com.wansensoft.utils.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/InOutItemController.java b/src/main/java/com/wansensoft/controller/InOutItemController.java similarity index 91% rename from src/main/java/com/wansensoft/erp/controller/InOutItemController.java rename to src/main/java/com/wansensoft/controller/InOutItemController.java index 0eccf07c..c02d7321 100644 --- a/src/main/java/com/wansensoft/erp/controller/InOutItemController.java +++ b/src/main/java/com/wansensoft/controller/InOutItemController.java @@ -1,11 +1,11 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.datasource.entities.InOutItem; -import com.wansensoft.erp.service.inOutItem.InOutItemService; -import com.wansensoft.erp.utils.ErpInfo; -import com.wansensoft.erp.utils.ResponseJsonUtil; +import com.wansensoft.datasource.entities.InOutItem; +import com.wansensoft.service.inOutItem.InOutItemService; +import com.wansensoft.utils.ErpInfo; +import com.wansensoft.utils.ResponseJsonUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/MaterialAttributeController.java b/src/main/java/com/wansensoft/controller/MaterialAttributeController.java similarity index 93% rename from src/main/java/com/wansensoft/erp/controller/MaterialAttributeController.java rename to src/main/java/com/wansensoft/controller/MaterialAttributeController.java index 20508598..338b5ce7 100644 --- a/src/main/java/com/wansensoft/erp/controller/MaterialAttributeController.java +++ b/src/main/java/com/wansensoft/controller/MaterialAttributeController.java @@ -1,9 +1,9 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.datasource.entities.MaterialAttribute; -import com.wansensoft.erp.service.materialAttribute.MaterialAttributeService; +import com.wansensoft.datasource.entities.MaterialAttribute; +import com.wansensoft.service.materialAttribute.MaterialAttributeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/MaterialCategoryController.java b/src/main/java/com/wansensoft/controller/MaterialCategoryController.java similarity index 93% rename from src/main/java/com/wansensoft/erp/controller/MaterialCategoryController.java rename to src/main/java/com/wansensoft/controller/MaterialCategoryController.java index 8529d804..7907c4b5 100644 --- a/src/main/java/com/wansensoft/erp/controller/MaterialCategoryController.java +++ b/src/main/java/com/wansensoft/controller/MaterialCategoryController.java @@ -1,14 +1,14 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.MaterialCategory; -import com.wansensoft.erp.datasource.vo.TreeNode; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.service.materialCategory.MaterialCategoryService; -import com.wansensoft.erp.utils.BaseResponseInfo; +import com.wansensoft.datasource.entities.MaterialCategory; +import com.wansensoft.datasource.vo.TreeNode; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.service.materialCategory.MaterialCategoryService; +import com.wansensoft.utils.BaseResponseInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/MaterialController.java b/src/main/java/com/wansensoft/controller/MaterialController.java similarity index 97% rename from src/main/java/com/wansensoft/erp/controller/MaterialController.java rename to src/main/java/com/wansensoft/controller/MaterialController.java index c5370340..1c32f49f 100644 --- a/src/main/java/com/wansensoft/erp/controller/MaterialController.java +++ b/src/main/java/com/wansensoft/controller/MaterialController.java @@ -1,18 +1,18 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.datasource.entities.MaterialExtend; -import com.wansensoft.erp.datasource.entities.MaterialVo4Unit; -import com.wansensoft.erp.datasource.entities.Unit; -import com.wansensoft.erp.service.depot.DepotService; -import com.wansensoft.erp.service.depotItem.DepotItemService; -import com.wansensoft.erp.service.material.MaterialService; -import com.wansensoft.erp.service.unit.UnitService; -import com.wansensoft.erp.utils.BaseResponseInfo; -import com.wansensoft.erp.utils.ErpInfo; -import com.wansensoft.erp.utils.StringUtil; -import com.wansensoft.erp.utils.ResponseJsonUtil; +import com.wansensoft.datasource.entities.MaterialExtend; +import com.wansensoft.datasource.entities.MaterialVo4Unit; +import com.wansensoft.datasource.entities.Unit; +import com.wansensoft.service.depot.DepotService; +import com.wansensoft.service.depotItem.DepotItemService; +import com.wansensoft.service.material.MaterialService; +import com.wansensoft.service.unit.UnitService; +import com.wansensoft.utils.BaseResponseInfo; +import com.wansensoft.utils.ErpInfo; +import com.wansensoft.utils.StringUtil; +import com.wansensoft.utils.ResponseJsonUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/MaterialExtendController.java b/src/main/java/com/wansensoft/controller/MaterialExtendController.java similarity index 93% rename from src/main/java/com/wansensoft/erp/controller/MaterialExtendController.java rename to src/main/java/com/wansensoft/controller/MaterialExtendController.java index c8309751..ff89a131 100644 --- a/src/main/java/com/wansensoft/erp/controller/MaterialExtendController.java +++ b/src/main/java/com/wansensoft/controller/MaterialExtendController.java @@ -1,12 +1,12 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.datasource.entities.MaterialExtend; -import com.wansensoft.erp.datasource.vo.MaterialExtendVo4List; -import com.wansensoft.erp.service.materialExtend.MaterialExtendService; -import com.wansensoft.erp.utils.BaseResponseInfo; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.datasource.entities.MaterialExtend; +import com.wansensoft.datasource.vo.MaterialExtendVo4List; +import com.wansensoft.service.materialExtend.MaterialExtendService; +import com.wansensoft.utils.BaseResponseInfo; +import com.wansensoft.utils.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/MaterialPropertyController.java b/src/main/java/com/wansensoft/controller/MaterialPropertyController.java similarity index 84% rename from src/main/java/com/wansensoft/erp/controller/MaterialPropertyController.java rename to src/main/java/com/wansensoft/controller/MaterialPropertyController.java index 25638720..2b1ede02 100644 --- a/src/main/java/com/wansensoft/erp/controller/MaterialPropertyController.java +++ b/src/main/java/com/wansensoft/controller/MaterialPropertyController.java @@ -1,8 +1,8 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; -import com.wansensoft.erp.datasource.entities.MaterialProperty; -import com.wansensoft.erp.service.materialProperty.MaterialPropertyService; -import com.wansensoft.erp.utils.BaseResponseInfo; +import com.wansensoft.datasource.entities.MaterialProperty; +import com.wansensoft.service.materialProperty.MaterialPropertyService; +import com.wansensoft.utils.BaseResponseInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/wansensoft/erp/controller/MsgController.java b/src/main/java/com/wansensoft/controller/MsgController.java similarity index 96% rename from src/main/java/com/wansensoft/erp/controller/MsgController.java rename to src/main/java/com/wansensoft/controller/MsgController.java index 048aba9f..a4715d1a 100644 --- a/src/main/java/com/wansensoft/erp/controller/MsgController.java +++ b/src/main/java/com/wansensoft/controller/MsgController.java @@ -1,9 +1,9 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.datasource.entities.MsgEx; -import com.wansensoft.erp.service.msg.MsgService; -import com.wansensoft.erp.utils.BaseResponseInfo; +import com.wansensoft.datasource.entities.MsgEx; +import com.wansensoft.service.msg.MsgService; +import com.wansensoft.utils.BaseResponseInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/OrganizationController.java b/src/main/java/com/wansensoft/controller/OrganizationController.java similarity index 92% rename from src/main/java/com/wansensoft/erp/controller/OrganizationController.java rename to src/main/java/com/wansensoft/controller/OrganizationController.java index b6f90db3..67e67eeb 100644 --- a/src/main/java/com/wansensoft/erp/controller/OrganizationController.java +++ b/src/main/java/com/wansensoft/controller/OrganizationController.java @@ -1,14 +1,14 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.Organization; -import com.wansensoft.erp.datasource.vo.TreeNode; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.service.organization.OrganizationService; -import com.wansensoft.erp.utils.BaseResponseInfo; +import com.wansensoft.datasource.entities.Organization; +import com.wansensoft.datasource.vo.TreeNode; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.service.organization.OrganizationService; +import com.wansensoft.utils.BaseResponseInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/PersonController.java b/src/main/java/com/wansensoft/controller/PersonController.java similarity index 94% rename from src/main/java/com/wansensoft/erp/controller/PersonController.java rename to src/main/java/com/wansensoft/controller/PersonController.java index 2281c607..9062a61c 100644 --- a/src/main/java/com/wansensoft/erp/controller/PersonController.java +++ b/src/main/java/com/wansensoft/controller/PersonController.java @@ -1,12 +1,12 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.datasource.entities.Person; -import com.wansensoft.erp.service.person.PersonService; -import com.wansensoft.erp.utils.BaseResponseInfo; -import com.wansensoft.erp.utils.ErpInfo; -import com.wansensoft.erp.utils.ResponseJsonUtil; +import com.wansensoft.datasource.entities.Person; +import com.wansensoft.service.person.PersonService; +import com.wansensoft.utils.BaseResponseInfo; +import com.wansensoft.utils.ErpInfo; +import com.wansensoft.utils.ResponseJsonUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/PlatformConfigController.java b/src/main/java/com/wansensoft/controller/PlatformConfigController.java similarity index 93% rename from src/main/java/com/wansensoft/erp/controller/PlatformConfigController.java rename to src/main/java/com/wansensoft/controller/PlatformConfigController.java index 27704397..d25625c1 100644 --- a/src/main/java/com/wansensoft/erp/controller/PlatformConfigController.java +++ b/src/main/java/com/wansensoft/controller/PlatformConfigController.java @@ -1,11 +1,11 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.datasource.entities.PlatformConfig; -import com.wansensoft.erp.service.platformConfig.PlatformConfigService; -import com.wansensoft.erp.utils.BaseResponseInfo; -import com.wansensoft.erp.utils.ErpInfo; -import com.wansensoft.erp.utils.ResponseJsonUtil; +import com.wansensoft.datasource.entities.PlatformConfig; +import com.wansensoft.service.platformConfig.PlatformConfigService; +import com.wansensoft.utils.BaseResponseInfo; +import com.wansensoft.utils.ErpInfo; +import com.wansensoft.utils.ResponseJsonUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/PluginController.java b/src/main/java/com/wansensoft/controller/PluginController.java similarity index 97% rename from src/main/java/com/wansensoft/erp/controller/PluginController.java rename to src/main/java/com/wansensoft/controller/PluginController.java index c8095f7e..9b88eadb 100644 --- a/src/main/java/com/wansensoft/erp/controller/PluginController.java +++ b/src/main/java/com/wansensoft/controller/PluginController.java @@ -1,11 +1,11 @@ //package com.wansensoft.erp.controller; // -//import com.wansensoft.erp.constants.BusinessConstants; -//import com.wansensoft.erp.datasource.entities.User; -//import com.wansensoft.erp.service.user.UserService; -//import com.wansensoft.erp.utils.BaseResponseInfo; -//import com.wansensoft.erp.utils.ComputerInfo; -//import com.wansensoft.erp.utils.StringUtil; +//import constants.com.wansensoft.BusinessConstants; +//import entities.datasource.com.wansensoft.User; +//import user.service.com.wansensoft.UserService; +//import utils.com.wansensoft.BaseResponseInfo; +//import utils.com.wansensoft.ComputerInfo; +//import utils.com.wansensoft.StringUtil; //import io.swagger.annotations.Api; //import io.swagger.annotations.ApiOperation; //import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/wansensoft/erp/controller/ResourceController.java b/src/main/java/com/wansensoft/controller/ResourceController.java similarity index 97% rename from src/main/java/com/wansensoft/erp/controller/ResourceController.java rename to src/main/java/com/wansensoft/controller/ResourceController.java index 003d96f8..5a17cb98 100644 --- a/src/main/java/com/wansensoft/erp/controller/ResourceController.java +++ b/src/main/java/com/wansensoft/controller/ResourceController.java @@ -1,9 +1,9 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.service.CommonQueryManager; -import com.wansensoft.erp.utils.*; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.service.CommonQueryManager; +import com.wansensoft.utils.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/controller/RoleController.java b/src/main/java/com/wansensoft/controller/RoleController.java similarity index 90% rename from src/main/java/com/wansensoft/erp/controller/RoleController.java rename to src/main/java/com/wansensoft/controller/RoleController.java index dba88e04..6c4aab3e 100644 --- a/src/main/java/com/wansensoft/erp/controller/RoleController.java +++ b/src/main/java/com/wansensoft/controller/RoleController.java @@ -1,12 +1,12 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.datasource.entities.Role; -import com.wansensoft.erp.service.role.RoleService; -import com.wansensoft.erp.service.userBusiness.UserBusinessService; -import com.wansensoft.erp.utils.ErpInfo; -import com.wansensoft.erp.utils.ResponseJsonUtil; +import com.wansensoft.datasource.entities.Role; +import com.wansensoft.service.role.RoleService; +import com.wansensoft.service.userBusiness.UserBusinessService; +import com.wansensoft.utils.ErpInfo; +import com.wansensoft.utils.ResponseJsonUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/SequenceController.java b/src/main/java/com/wansensoft/controller/SequenceController.java similarity index 90% rename from src/main/java/com/wansensoft/erp/controller/SequenceController.java rename to src/main/java/com/wansensoft/controller/SequenceController.java index 74c518e9..6a887db9 100644 --- a/src/main/java/com/wansensoft/erp/controller/SequenceController.java +++ b/src/main/java/com/wansensoft/controller/SequenceController.java @@ -1,7 +1,7 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; -import com.wansensoft.erp.service.sequence.SequenceService; -import com.wansensoft.erp.utils.BaseResponseInfo; +import com.wansensoft.service.sequence.SequenceService; +import com.wansensoft.utils.BaseResponseInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/SerialNumberController.java b/src/main/java/com/wansensoft/controller/SerialNumberController.java similarity index 88% rename from src/main/java/com/wansensoft/erp/controller/SerialNumberController.java rename to src/main/java/com/wansensoft/controller/SerialNumberController.java index 4862ee45..b2ca4955 100644 --- a/src/main/java/com/wansensoft/erp/controller/SerialNumberController.java +++ b/src/main/java/com/wansensoft/controller/SerialNumberController.java @@ -1,15 +1,15 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.datasource.entities.DepotItem; -import com.wansensoft.erp.datasource.entities.SerialNumberEx; -import com.wansensoft.erp.service.depotHead.DepotHeadService; -import com.wansensoft.erp.service.depotItem.DepotItemService; -import com.wansensoft.erp.service.serialNumber.SerialNumberService; -import com.wansensoft.erp.utils.BaseResponseInfo; -import com.wansensoft.erp.utils.ErpInfo; -import com.wansensoft.erp.utils.Tools; -import com.wansensoft.erp.utils.ResponseJsonUtil; +import com.wansensoft.datasource.entities.DepotItem; +import com.wansensoft.datasource.entities.SerialNumberEx; +import com.wansensoft.service.depotHead.DepotHeadService; +import com.wansensoft.service.depotItem.DepotItemService; +import com.wansensoft.service.serialNumber.SerialNumberService; +import com.wansensoft.utils.BaseResponseInfo; +import com.wansensoft.utils.ErpInfo; +import com.wansensoft.utils.Tools; +import com.wansensoft.utils.ResponseJsonUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/SupplierController.java b/src/main/java/com/wansensoft/controller/SupplierController.java similarity index 96% rename from src/main/java/com/wansensoft/erp/controller/SupplierController.java rename to src/main/java/com/wansensoft/controller/SupplierController.java index ff53fa96..5e0e66cb 100644 --- a/src/main/java/com/wansensoft/erp/controller/SupplierController.java +++ b/src/main/java/com/wansensoft/controller/SupplierController.java @@ -1,16 +1,16 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.datasource.entities.Supplier; -import com.wansensoft.erp.service.supplier.SupplierService; -import com.wansensoft.erp.service.systemConfig.SystemConfigService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.service.userBusiness.UserBusinessService; -import com.wansensoft.erp.utils.BaseResponseInfo; -import com.wansensoft.erp.utils.ErpInfo; -import com.wansensoft.erp.utils.ExcelUtils; -import com.wansensoft.erp.utils.ResponseJsonUtil; +import com.wansensoft.datasource.entities.Supplier; +import com.wansensoft.service.supplier.SupplierService; +import com.wansensoft.service.systemConfig.SystemConfigService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.service.userBusiness.UserBusinessService; +import com.wansensoft.utils.BaseResponseInfo; +import com.wansensoft.utils.ErpInfo; +import com.wansensoft.utils.ExcelUtils; +import com.wansensoft.utils.ResponseJsonUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/SystemConfigController.java b/src/main/java/com/wansensoft/controller/SystemConfigController.java similarity index 95% rename from src/main/java/com/wansensoft/erp/controller/SystemConfigController.java rename to src/main/java/com/wansensoft/controller/SystemConfigController.java index 34dcdb3a..fd110ab3 100644 --- a/src/main/java/com/wansensoft/erp/controller/SystemConfigController.java +++ b/src/main/java/com/wansensoft/controller/SystemConfigController.java @@ -1,12 +1,12 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; -import com.wansensoft.erp.datasource.entities.SystemConfig; -import com.wansensoft.erp.service.depot.DepotService; -import com.wansensoft.erp.service.systemConfig.SystemConfigService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.service.userBusiness.UserBusinessService; -import com.wansensoft.erp.utils.BaseResponseInfo; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.datasource.entities.SystemConfig; +import com.wansensoft.service.depot.DepotService; +import com.wansensoft.service.systemConfig.SystemConfigService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.service.userBusiness.UserBusinessService; +import com.wansensoft.utils.BaseResponseInfo; +import com.wansensoft.utils.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/TenantController.java b/src/main/java/com/wansensoft/controller/TenantController.java similarity index 88% rename from src/main/java/com/wansensoft/erp/controller/TenantController.java rename to src/main/java/com/wansensoft/controller/TenantController.java index 094c6991..e23a2d75 100644 --- a/src/main/java/com/wansensoft/erp/controller/TenantController.java +++ b/src/main/java/com/wansensoft/controller/TenantController.java @@ -1,9 +1,9 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.tenant.TenantService; -import com.wansensoft.erp.utils.ErpInfo; -import com.wansensoft.erp.utils.ResponseJsonUtil; +import com.wansensoft.service.tenant.TenantService; +import com.wansensoft.utils.ErpInfo; +import com.wansensoft.utils.ResponseJsonUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/UnitController.java b/src/main/java/com/wansensoft/controller/UnitController.java similarity index 87% rename from src/main/java/com/wansensoft/erp/controller/UnitController.java rename to src/main/java/com/wansensoft/controller/UnitController.java index 91af2bbd..129e3b29 100644 --- a/src/main/java/com/wansensoft/erp/controller/UnitController.java +++ b/src/main/java/com/wansensoft/controller/UnitController.java @@ -1,11 +1,11 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.datasource.entities.Unit; -import com.wansensoft.erp.service.unit.UnitService; -import com.wansensoft.erp.utils.BaseResponseInfo; -import com.wansensoft.erp.utils.ErpInfo; -import com.wansensoft.erp.utils.ResponseJsonUtil; +import com.wansensoft.datasource.entities.Unit; +import com.wansensoft.service.unit.UnitService; +import com.wansensoft.utils.BaseResponseInfo; +import com.wansensoft.utils.ErpInfo; +import com.wansensoft.utils.ResponseJsonUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/controller/UserBusinessController.java b/src/main/java/com/wansensoft/controller/UserBusinessController.java similarity index 90% rename from src/main/java/com/wansensoft/erp/controller/UserBusinessController.java rename to src/main/java/com/wansensoft/controller/UserBusinessController.java index 173495e2..16ce3d85 100644 --- a/src/main/java/com/wansensoft/erp/controller/UserBusinessController.java +++ b/src/main/java/com/wansensoft/controller/UserBusinessController.java @@ -1,12 +1,12 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.datasource.entities.UserBusiness; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.service.userBusiness.UserBusinessService; -import com.wansensoft.erp.utils.BaseResponseInfo; -import com.wansensoft.erp.utils.ErpInfo; -import com.wansensoft.erp.utils.ResponseJsonUtil; +import com.wansensoft.datasource.entities.UserBusiness; +import com.wansensoft.service.user.UserService; +import com.wansensoft.service.userBusiness.UserBusinessService; +import com.wansensoft.utils.BaseResponseInfo; +import com.wansensoft.utils.ErpInfo; +import com.wansensoft.utils.ResponseJsonUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/controller/UserController.java b/src/main/java/com/wansensoft/controller/UserController.java similarity index 96% rename from src/main/java/com/wansensoft/erp/controller/UserController.java rename to src/main/java/com/wansensoft/controller/UserController.java index 6ebb5fff..244de763 100644 --- a/src/main/java/com/wansensoft/erp/controller/UserController.java +++ b/src/main/java/com/wansensoft/controller/UserController.java @@ -1,20 +1,20 @@ -package com.wansensoft.erp.controller; +package com.wansensoft.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.Tenant; -import com.wansensoft.erp.datasource.entities.User; -import com.wansensoft.erp.datasource.entities.UserEx; -import com.wansensoft.erp.datasource.vo.TreeNodeEx; -import com.wansensoft.erp.exception.BusinessParamCheckingException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.redis.RedisService; -import com.wansensoft.erp.service.role.RoleService; -import com.wansensoft.erp.service.tenant.TenantService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.*; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.entities.Tenant; +import com.wansensoft.datasource.entities.User; +import com.wansensoft.datasource.entities.UserEx; +import com.wansensoft.datasource.vo.TreeNodeEx; +import com.wansensoft.exception.BusinessParamCheckingException; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.redis.RedisService; +import com.wansensoft.service.role.RoleService; +import com.wansensoft.service.tenant.TenantService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/Account.java b/src/main/java/com/wansensoft/datasource/entities/Account.java similarity index 97% rename from src/main/java/com/wansensoft/erp/datasource/entities/Account.java rename to src/main/java/com/wansensoft/datasource/entities/Account.java index db601ded..49706498 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/Account.java +++ b/src/main/java/com/wansensoft/datasource/entities/Account.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/AccountExample.java b/src/main/java/com/wansensoft/datasource/entities/AccountExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/AccountExample.java rename to src/main/java/com/wansensoft/datasource/entities/AccountExample.java index 9655f3ec..a269dfd3 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/AccountExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/AccountExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/AccountHead.java b/src/main/java/com/wansensoft/datasource/entities/AccountHead.java similarity index 98% rename from src/main/java/com/wansensoft/erp/datasource/entities/AccountHead.java rename to src/main/java/com/wansensoft/datasource/entities/AccountHead.java index 7d856b67..10ecf82e 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/AccountHead.java +++ b/src/main/java/com/wansensoft/datasource/entities/AccountHead.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/AccountHeadExample.java b/src/main/java/com/wansensoft/datasource/entities/AccountHeadExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/AccountHeadExample.java rename to src/main/java/com/wansensoft/datasource/entities/AccountHeadExample.java index c4137fdc..70d0fbbf 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/AccountHeadExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/AccountHeadExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/AccountHeadVo4Body.java b/src/main/java/com/wansensoft/datasource/entities/AccountHeadVo4Body.java similarity index 90% rename from src/main/java/com/wansensoft/erp/datasource/entities/AccountHeadVo4Body.java rename to src/main/java/com/wansensoft/datasource/entities/AccountHeadVo4Body.java index cdee8a85..f32a3d84 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/AccountHeadVo4Body.java +++ b/src/main/java/com/wansensoft/datasource/entities/AccountHeadVo4Body.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; public class AccountHeadVo4Body { diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/AccountHeadVo4ListEx.java b/src/main/java/com/wansensoft/datasource/entities/AccountHeadVo4ListEx.java similarity index 95% rename from src/main/java/com/wansensoft/erp/datasource/entities/AccountHeadVo4ListEx.java rename to src/main/java/com/wansensoft/datasource/entities/AccountHeadVo4ListEx.java index d740f53a..ecfc8adc 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/AccountHeadVo4ListEx.java +++ b/src/main/java/com/wansensoft/datasource/entities/AccountHeadVo4ListEx.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; public class AccountHeadVo4ListEx extends AccountHead{ diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/AccountItem.java b/src/main/java/com/wansensoft/datasource/entities/AccountItem.java similarity index 97% rename from src/main/java/com/wansensoft/erp/datasource/entities/AccountItem.java rename to src/main/java/com/wansensoft/datasource/entities/AccountItem.java index 395f2212..aba094a2 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/AccountItem.java +++ b/src/main/java/com/wansensoft/datasource/entities/AccountItem.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/AccountItemExample.java b/src/main/java/com/wansensoft/datasource/entities/AccountItemExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/AccountItemExample.java rename to src/main/java/com/wansensoft/datasource/entities/AccountItemExample.java index 6f176490..8a868318 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/AccountItemExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/AccountItemExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/Depot.java b/src/main/java/com/wansensoft/datasource/entities/Depot.java similarity index 98% rename from src/main/java/com/wansensoft/erp/datasource/entities/Depot.java rename to src/main/java/com/wansensoft/datasource/entities/Depot.java index e9763dff..12240ad1 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/Depot.java +++ b/src/main/java/com/wansensoft/datasource/entities/Depot.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/DepotEx.java b/src/main/java/com/wansensoft/datasource/entities/DepotEx.java similarity index 88% rename from src/main/java/com/wansensoft/erp/datasource/entities/DepotEx.java rename to src/main/java/com/wansensoft/datasource/entities/DepotEx.java index a8c7e32d..2e5fba46 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/DepotEx.java +++ b/src/main/java/com/wansensoft/datasource/entities/DepotEx.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import lombok.Data; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/DepotExample.java b/src/main/java/com/wansensoft/datasource/entities/DepotExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/DepotExample.java rename to src/main/java/com/wansensoft/datasource/entities/DepotExample.java index dbbe9a1b..2e9b1230 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/DepotExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/DepotExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/DepotHead.java b/src/main/java/com/wansensoft/datasource/entities/DepotHead.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/DepotHead.java rename to src/main/java/com/wansensoft/datasource/entities/DepotHead.java index 946c0450..caa39a49 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/DepotHead.java +++ b/src/main/java/com/wansensoft/datasource/entities/DepotHead.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/DepotHeadExample.java b/src/main/java/com/wansensoft/datasource/entities/DepotHeadExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/DepotHeadExample.java rename to src/main/java/com/wansensoft/datasource/entities/DepotHeadExample.java index 1c6150e9..e791370e 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/DepotHeadExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/DepotHeadExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/DepotHeadVo4Body.java b/src/main/java/com/wansensoft/datasource/entities/DepotHeadVo4Body.java similarity index 93% rename from src/main/java/com/wansensoft/erp/datasource/entities/DepotHeadVo4Body.java rename to src/main/java/com/wansensoft/datasource/entities/DepotHeadVo4Body.java index 3e8c20e1..939a9b3c 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/DepotHeadVo4Body.java +++ b/src/main/java/com/wansensoft/datasource/entities/DepotHeadVo4Body.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/DepotItem.java b/src/main/java/com/wansensoft/datasource/entities/DepotItem.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/DepotItem.java rename to src/main/java/com/wansensoft/datasource/entities/DepotItem.java index b5442280..f1237755 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/DepotItem.java +++ b/src/main/java/com/wansensoft/datasource/entities/DepotItem.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/DepotItemExample.java b/src/main/java/com/wansensoft/datasource/entities/DepotItemExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/DepotItemExample.java rename to src/main/java/com/wansensoft/datasource/entities/DepotItemExample.java index ecfbf853..fceef414 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/DepotItemExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/DepotItemExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/DepotItemVo4DetailByTypeAndMId.java b/src/main/java/com/wansensoft/datasource/entities/DepotItemVo4DetailByTypeAndMId.java similarity index 96% rename from src/main/java/com/wansensoft/erp/datasource/entities/DepotItemVo4DetailByTypeAndMId.java rename to src/main/java/com/wansensoft/datasource/entities/DepotItemVo4DetailByTypeAndMId.java index 3976e031..8ad47f56 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/DepotItemVo4DetailByTypeAndMId.java +++ b/src/main/java/com/wansensoft/datasource/entities/DepotItemVo4DetailByTypeAndMId.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/DepotItemVo4Material.java b/src/main/java/com/wansensoft/datasource/entities/DepotItemVo4Material.java similarity index 88% rename from src/main/java/com/wansensoft/erp/datasource/entities/DepotItemVo4Material.java rename to src/main/java/com/wansensoft/datasource/entities/DepotItemVo4Material.java index f206d9e4..93238feb 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/DepotItemVo4Material.java +++ b/src/main/java/com/wansensoft/datasource/entities/DepotItemVo4Material.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; public class DepotItemVo4Material extends DepotItem{ diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/DepotItemVo4MaterialAndSum.java b/src/main/java/com/wansensoft/datasource/entities/DepotItemVo4MaterialAndSum.java similarity index 91% rename from src/main/java/com/wansensoft/erp/datasource/entities/DepotItemVo4MaterialAndSum.java rename to src/main/java/com/wansensoft/datasource/entities/DepotItemVo4MaterialAndSum.java index d23f1e13..36859eda 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/DepotItemVo4MaterialAndSum.java +++ b/src/main/java/com/wansensoft/datasource/entities/DepotItemVo4MaterialAndSum.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/DepotItemVo4WithInfoEx.java b/src/main/java/com/wansensoft/datasource/entities/DepotItemVo4WithInfoEx.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/DepotItemVo4WithInfoEx.java rename to src/main/java/com/wansensoft/datasource/entities/DepotItemVo4WithInfoEx.java index 624c17f0..145d10f7 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/DepotItemVo4WithInfoEx.java +++ b/src/main/java/com/wansensoft/datasource/entities/DepotItemVo4WithInfoEx.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/Function.java b/src/main/java/com/wansensoft/datasource/entities/Function.java similarity index 98% rename from src/main/java/com/wansensoft/erp/datasource/entities/Function.java rename to src/main/java/com/wansensoft/datasource/entities/Function.java index 423af2a1..ee13023c 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/Function.java +++ b/src/main/java/com/wansensoft/datasource/entities/Function.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; public class Function { private Long id; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/FunctionEx.java b/src/main/java/com/wansensoft/datasource/entities/FunctionEx.java similarity index 83% rename from src/main/java/com/wansensoft/erp/datasource/entities/FunctionEx.java rename to src/main/java/com/wansensoft/datasource/entities/FunctionEx.java index 80731ec8..5c8894a4 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/FunctionEx.java +++ b/src/main/java/com/wansensoft/datasource/entities/FunctionEx.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; public class FunctionEx extends Function { diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/FunctionExample.java b/src/main/java/com/wansensoft/datasource/entities/FunctionExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/FunctionExample.java rename to src/main/java/com/wansensoft/datasource/entities/FunctionExample.java index d1b7b521..4c1cafbb 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/FunctionExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/FunctionExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/InOutItem.java b/src/main/java/com/wansensoft/datasource/entities/InOutItem.java similarity index 96% rename from src/main/java/com/wansensoft/erp/datasource/entities/InOutItem.java rename to src/main/java/com/wansensoft/datasource/entities/InOutItem.java index 09efebb9..fd7f59d0 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/InOutItem.java +++ b/src/main/java/com/wansensoft/datasource/entities/InOutItem.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; public class InOutItem { private Long id; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/InOutItemExample.java b/src/main/java/com/wansensoft/datasource/entities/InOutItemExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/InOutItemExample.java rename to src/main/java/com/wansensoft/datasource/entities/InOutItemExample.java index 466b4f64..f48db628 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/InOutItemExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/InOutItemExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/Log.java b/src/main/java/com/wansensoft/datasource/entities/Log.java similarity index 96% rename from src/main/java/com/wansensoft/erp/datasource/entities/Log.java rename to src/main/java/com/wansensoft/datasource/entities/Log.java index 554f9273..d44a1cf8 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/Log.java +++ b/src/main/java/com/wansensoft/datasource/entities/Log.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/LogExample.java b/src/main/java/com/wansensoft/datasource/entities/LogExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/LogExample.java rename to src/main/java/com/wansensoft/datasource/entities/LogExample.java index be971bc4..69fb4210 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/LogExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/LogExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/Material.java b/src/main/java/com/wansensoft/datasource/entities/Material.java similarity index 98% rename from src/main/java/com/wansensoft/erp/datasource/entities/Material.java rename to src/main/java/com/wansensoft/datasource/entities/Material.java index 57349df5..c24d1ad9 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/Material.java +++ b/src/main/java/com/wansensoft/datasource/entities/Material.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialAttribute.java b/src/main/java/com/wansensoft/datasource/entities/MaterialAttribute.java similarity index 95% rename from src/main/java/com/wansensoft/erp/datasource/entities/MaterialAttribute.java rename to src/main/java/com/wansensoft/datasource/entities/MaterialAttribute.java index 22249fbb..b0279bd9 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialAttribute.java +++ b/src/main/java/com/wansensoft/datasource/entities/MaterialAttribute.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; public class MaterialAttribute { private Long id; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialAttributeExample.java b/src/main/java/com/wansensoft/datasource/entities/MaterialAttributeExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/MaterialAttributeExample.java rename to src/main/java/com/wansensoft/datasource/entities/MaterialAttributeExample.java index 25f3ca09..6e4d0d18 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialAttributeExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/MaterialAttributeExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialCategory.java b/src/main/java/com/wansensoft/datasource/entities/MaterialCategory.java similarity index 97% rename from src/main/java/com/wansensoft/erp/datasource/entities/MaterialCategory.java rename to src/main/java/com/wansensoft/datasource/entities/MaterialCategory.java index b27f0820..9dd14ce3 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialCategory.java +++ b/src/main/java/com/wansensoft/datasource/entities/MaterialCategory.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialCategoryExample.java b/src/main/java/com/wansensoft/datasource/entities/MaterialCategoryExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/MaterialCategoryExample.java rename to src/main/java/com/wansensoft/datasource/entities/MaterialCategoryExample.java index 7a900351..ebe5464a 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialCategoryExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/MaterialCategoryExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialCurrentStock.java b/src/main/java/com/wansensoft/datasource/entities/MaterialCurrentStock.java similarity index 96% rename from src/main/java/com/wansensoft/erp/datasource/entities/MaterialCurrentStock.java rename to src/main/java/com/wansensoft/datasource/entities/MaterialCurrentStock.java index 51b649f0..f4f47cb9 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialCurrentStock.java +++ b/src/main/java/com/wansensoft/datasource/entities/MaterialCurrentStock.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialCurrentStockExample.java b/src/main/java/com/wansensoft/datasource/entities/MaterialCurrentStockExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/MaterialCurrentStockExample.java rename to src/main/java/com/wansensoft/datasource/entities/MaterialCurrentStockExample.java index f69559e8..d39eab0b 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialCurrentStockExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/MaterialCurrentStockExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialExample.java b/src/main/java/com/wansensoft/datasource/entities/MaterialExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/MaterialExample.java rename to src/main/java/com/wansensoft/datasource/entities/MaterialExample.java index 8532a070..80d025c3 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/MaterialExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialExtend.java b/src/main/java/com/wansensoft/datasource/entities/MaterialExtend.java similarity index 98% rename from src/main/java/com/wansensoft/erp/datasource/entities/MaterialExtend.java rename to src/main/java/com/wansensoft/datasource/entities/MaterialExtend.java index 93309e60..b18ec75c 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialExtend.java +++ b/src/main/java/com/wansensoft/datasource/entities/MaterialExtend.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialExtendExample.java b/src/main/java/com/wansensoft/datasource/entities/MaterialExtendExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/MaterialExtendExample.java rename to src/main/java/com/wansensoft/datasource/entities/MaterialExtendExample.java index c0aa95f6..0cb530ec 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialExtendExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/MaterialExtendExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialInitialStock.java b/src/main/java/com/wansensoft/datasource/entities/MaterialInitialStock.java similarity index 97% rename from src/main/java/com/wansensoft/erp/datasource/entities/MaterialInitialStock.java rename to src/main/java/com/wansensoft/datasource/entities/MaterialInitialStock.java index 14975b54..54953b7b 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialInitialStock.java +++ b/src/main/java/com/wansensoft/datasource/entities/MaterialInitialStock.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialInitialStockExample.java b/src/main/java/com/wansensoft/datasource/entities/MaterialInitialStockExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/MaterialInitialStockExample.java rename to src/main/java/com/wansensoft/datasource/entities/MaterialInitialStockExample.java index d98856fb..b75cd9d4 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialInitialStockExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/MaterialInitialStockExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialInitialStockWithMaterial.java b/src/main/java/com/wansensoft/datasource/entities/MaterialInitialStockWithMaterial.java similarity index 90% rename from src/main/java/com/wansensoft/erp/datasource/entities/MaterialInitialStockWithMaterial.java rename to src/main/java/com/wansensoft/datasource/entities/MaterialInitialStockWithMaterial.java index 312799f7..307f520f 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialInitialStockWithMaterial.java +++ b/src/main/java/com/wansensoft/datasource/entities/MaterialInitialStockWithMaterial.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialProperty.java b/src/main/java/com/wansensoft/datasource/entities/MaterialProperty.java similarity index 96% rename from src/main/java/com/wansensoft/erp/datasource/entities/MaterialProperty.java rename to src/main/java/com/wansensoft/datasource/entities/MaterialProperty.java index 789b263e..efe8d36a 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialProperty.java +++ b/src/main/java/com/wansensoft/datasource/entities/MaterialProperty.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; public class MaterialProperty { private Long id; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialPropertyExample.java b/src/main/java/com/wansensoft/datasource/entities/MaterialPropertyExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/MaterialPropertyExample.java rename to src/main/java/com/wansensoft/datasource/entities/MaterialPropertyExample.java index d91ac84e..f3bfbf8f 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialPropertyExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/MaterialPropertyExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialVo4Unit.java b/src/main/java/com/wansensoft/datasource/entities/MaterialVo4Unit.java similarity index 98% rename from src/main/java/com/wansensoft/erp/datasource/entities/MaterialVo4Unit.java rename to src/main/java/com/wansensoft/datasource/entities/MaterialVo4Unit.java index 8021c24d..3cd44aee 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialVo4Unit.java +++ b/src/main/java/com/wansensoft/datasource/entities/MaterialVo4Unit.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialWithInitStock.java b/src/main/java/com/wansensoft/datasource/entities/MaterialWithInitStock.java similarity index 92% rename from src/main/java/com/wansensoft/erp/datasource/entities/MaterialWithInitStock.java rename to src/main/java/com/wansensoft/datasource/entities/MaterialWithInitStock.java index cc1e77fb..e8e8cb8c 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MaterialWithInitStock.java +++ b/src/main/java/com/wansensoft/datasource/entities/MaterialWithInitStock.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/Msg.java b/src/main/java/com/wansensoft/datasource/entities/Msg.java similarity index 97% rename from src/main/java/com/wansensoft/erp/datasource/entities/Msg.java rename to src/main/java/com/wansensoft/datasource/entities/Msg.java index cfde8d2b..f06f1caa 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/Msg.java +++ b/src/main/java/com/wansensoft/datasource/entities/Msg.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MsgEx.java b/src/main/java/com/wansensoft/datasource/entities/MsgEx.java similarity index 84% rename from src/main/java/com/wansensoft/erp/datasource/entities/MsgEx.java rename to src/main/java/com/wansensoft/datasource/entities/MsgEx.java index c3f02290..5a86c50f 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MsgEx.java +++ b/src/main/java/com/wansensoft/datasource/entities/MsgEx.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; public class MsgEx extends Msg{ diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/MsgExample.java b/src/main/java/com/wansensoft/datasource/entities/MsgExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/MsgExample.java rename to src/main/java/com/wansensoft/datasource/entities/MsgExample.java index 76206b63..df973610 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/MsgExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/MsgExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/OrgaUserRel.java b/src/main/java/com/wansensoft/datasource/entities/OrgaUserRel.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/OrgaUserRel.java rename to src/main/java/com/wansensoft/datasource/entities/OrgaUserRel.java index 54e90fb2..9a5b8c81 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/OrgaUserRel.java +++ b/src/main/java/com/wansensoft/datasource/entities/OrgaUserRel.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/OrgaUserRelEx.java b/src/main/java/com/wansensoft/datasource/entities/OrgaUserRelEx.java similarity index 71% rename from src/main/java/com/wansensoft/erp/datasource/entities/OrgaUserRelEx.java rename to src/main/java/com/wansensoft/datasource/entities/OrgaUserRelEx.java index d9366a6b..f67de91c 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/OrgaUserRelEx.java +++ b/src/main/java/com/wansensoft/datasource/entities/OrgaUserRelEx.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; /** * Description diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/OrgaUserRelExample.java b/src/main/java/com/wansensoft/datasource/entities/OrgaUserRelExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/OrgaUserRelExample.java rename to src/main/java/com/wansensoft/datasource/entities/OrgaUserRelExample.java index 0f9cf194..482bbdbe 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/OrgaUserRelExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/OrgaUserRelExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/Organization.java b/src/main/java/com/wansensoft/datasource/entities/Organization.java similarity index 97% rename from src/main/java/com/wansensoft/erp/datasource/entities/Organization.java rename to src/main/java/com/wansensoft/datasource/entities/Organization.java index 137c61ac..7fdc0f9d 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/Organization.java +++ b/src/main/java/com/wansensoft/datasource/entities/Organization.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/OrganizationExample.java b/src/main/java/com/wansensoft/datasource/entities/OrganizationExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/OrganizationExample.java rename to src/main/java/com/wansensoft/datasource/entities/OrganizationExample.java index f7990890..9704a4e1 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/OrganizationExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/OrganizationExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/Person.java b/src/main/java/com/wansensoft/datasource/entities/Person.java similarity index 96% rename from src/main/java/com/wansensoft/erp/datasource/entities/Person.java rename to src/main/java/com/wansensoft/datasource/entities/Person.java index 7965980a..9e09ec74 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/Person.java +++ b/src/main/java/com/wansensoft/datasource/entities/Person.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; public class Person { private Long id; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/PersonExample.java b/src/main/java/com/wansensoft/datasource/entities/PersonExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/PersonExample.java rename to src/main/java/com/wansensoft/datasource/entities/PersonExample.java index e65c3d0b..4c55759a 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/PersonExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/PersonExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/PlatformConfig.java b/src/main/java/com/wansensoft/datasource/entities/PlatformConfig.java similarity index 95% rename from src/main/java/com/wansensoft/erp/datasource/entities/PlatformConfig.java rename to src/main/java/com/wansensoft/datasource/entities/PlatformConfig.java index dc4210dc..bca328d6 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/PlatformConfig.java +++ b/src/main/java/com/wansensoft/datasource/entities/PlatformConfig.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; public class PlatformConfig { private Long id; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/PlatformConfigExample.java b/src/main/java/com/wansensoft/datasource/entities/PlatformConfigExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/PlatformConfigExample.java rename to src/main/java/com/wansensoft/datasource/entities/PlatformConfigExample.java index 8b605d02..f336214d 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/PlatformConfigExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/PlatformConfigExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/Role.java b/src/main/java/com/wansensoft/datasource/entities/Role.java similarity index 97% rename from src/main/java/com/wansensoft/erp/datasource/entities/Role.java rename to src/main/java/com/wansensoft/datasource/entities/Role.java index 61da3a06..cdcce7c9 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/Role.java +++ b/src/main/java/com/wansensoft/datasource/entities/Role.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; public class Role { private Long id; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/RoleEx.java b/src/main/java/com/wansensoft/datasource/entities/RoleEx.java similarity index 84% rename from src/main/java/com/wansensoft/erp/datasource/entities/RoleEx.java rename to src/main/java/com/wansensoft/datasource/entities/RoleEx.java index c7946bfd..6ddc3834 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/RoleEx.java +++ b/src/main/java/com/wansensoft/datasource/entities/RoleEx.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; public class RoleEx extends Role{ diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/RoleExample.java b/src/main/java/com/wansensoft/datasource/entities/RoleExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/RoleExample.java rename to src/main/java/com/wansensoft/datasource/entities/RoleExample.java index 8b3bde87..3c78dba3 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/RoleExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/RoleExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/SerialNumber.java b/src/main/java/com/wansensoft/datasource/entities/SerialNumber.java similarity index 98% rename from src/main/java/com/wansensoft/erp/datasource/entities/SerialNumber.java rename to src/main/java/com/wansensoft/datasource/entities/SerialNumber.java index 23111bc0..6fc36f6e 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/SerialNumber.java +++ b/src/main/java/com/wansensoft/datasource/entities/SerialNumber.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/SerialNumberEx.java b/src/main/java/com/wansensoft/datasource/entities/SerialNumberEx.java similarity index 97% rename from src/main/java/com/wansensoft/erp/datasource/entities/SerialNumberEx.java rename to src/main/java/com/wansensoft/datasource/entities/SerialNumberEx.java index 4d70767f..20eb86ff 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/SerialNumberEx.java +++ b/src/main/java/com/wansensoft/datasource/entities/SerialNumberEx.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; /** * Description diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/SerialNumberExample.java b/src/main/java/com/wansensoft/datasource/entities/SerialNumberExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/SerialNumberExample.java rename to src/main/java/com/wansensoft/datasource/entities/SerialNumberExample.java index 87a59c63..cdc28ced 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/SerialNumberExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/SerialNumberExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/Supplier.java b/src/main/java/com/wansensoft/datasource/entities/Supplier.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/Supplier.java rename to src/main/java/com/wansensoft/datasource/entities/Supplier.java index e5a45e3a..478ae99f 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/Supplier.java +++ b/src/main/java/com/wansensoft/datasource/entities/Supplier.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/SupplierExample.java b/src/main/java/com/wansensoft/datasource/entities/SupplierExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/SupplierExample.java rename to src/main/java/com/wansensoft/datasource/entities/SupplierExample.java index 4740bc6e..f483be02 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/SupplierExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/SupplierExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/SysLoginModel.java b/src/main/java/com/wansensoft/datasource/entities/SysLoginModel.java similarity index 95% rename from src/main/java/com/wansensoft/erp/datasource/entities/SysLoginModel.java rename to src/main/java/com/wansensoft/datasource/entities/SysLoginModel.java index 763f56bc..9ab0d146 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/SysLoginModel.java +++ b/src/main/java/com/wansensoft/datasource/entities/SysLoginModel.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/SystemConfig.java b/src/main/java/com/wansensoft/datasource/entities/SystemConfig.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/SystemConfig.java rename to src/main/java/com/wansensoft/datasource/entities/SystemConfig.java index 8ac7f089..95cf6b16 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/SystemConfig.java +++ b/src/main/java/com/wansensoft/datasource/entities/SystemConfig.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; public class SystemConfig { private Long id; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/SystemConfigExample.java b/src/main/java/com/wansensoft/datasource/entities/SystemConfigExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/SystemConfigExample.java rename to src/main/java/com/wansensoft/datasource/entities/SystemConfigExample.java index 3d1fd23b..e133ea77 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/SystemConfigExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/SystemConfigExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/Tenant.java b/src/main/java/com/wansensoft/datasource/entities/Tenant.java similarity index 97% rename from src/main/java/com/wansensoft/erp/datasource/entities/Tenant.java rename to src/main/java/com/wansensoft/datasource/entities/Tenant.java index 8c4b3d5e..4854022a 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/Tenant.java +++ b/src/main/java/com/wansensoft/datasource/entities/Tenant.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/TenantEx.java b/src/main/java/com/wansensoft/datasource/entities/TenantEx.java similarity index 93% rename from src/main/java/com/wansensoft/erp/datasource/entities/TenantEx.java rename to src/main/java/com/wansensoft/datasource/entities/TenantEx.java index ab0e4367..83cbcdd0 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/TenantEx.java +++ b/src/main/java/com/wansensoft/datasource/entities/TenantEx.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; public class TenantEx extends Tenant{ diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/TenantExample.java b/src/main/java/com/wansensoft/datasource/entities/TenantExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/TenantExample.java rename to src/main/java/com/wansensoft/datasource/entities/TenantExample.java index 1152b5af..a26dafe4 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/TenantExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/TenantExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/Unit.java b/src/main/java/com/wansensoft/datasource/entities/Unit.java similarity index 98% rename from src/main/java/com/wansensoft/erp/datasource/entities/Unit.java rename to src/main/java/com/wansensoft/datasource/entities/Unit.java index f7c99a8e..f07eacf5 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/Unit.java +++ b/src/main/java/com/wansensoft/datasource/entities/Unit.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/UnitExample.java b/src/main/java/com/wansensoft/datasource/entities/UnitExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/UnitExample.java rename to src/main/java/com/wansensoft/datasource/entities/UnitExample.java index 2ac5ede9..115ec643 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/UnitExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/UnitExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/User.java b/src/main/java/com/wansensoft/datasource/entities/User.java similarity index 98% rename from src/main/java/com/wansensoft/erp/datasource/entities/User.java rename to src/main/java/com/wansensoft/datasource/entities/User.java index 8b0e41b3..e661e7e9 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/User.java +++ b/src/main/java/com/wansensoft/datasource/entities/User.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; public class User { private Long id; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/UserBusiness.java b/src/main/java/com/wansensoft/datasource/entities/UserBusiness.java similarity index 96% rename from src/main/java/com/wansensoft/erp/datasource/entities/UserBusiness.java rename to src/main/java/com/wansensoft/datasource/entities/UserBusiness.java index 3671e2d4..04a5c359 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/UserBusiness.java +++ b/src/main/java/com/wansensoft/datasource/entities/UserBusiness.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; public class UserBusiness { private Long id; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/UserBusinessExample.java b/src/main/java/com/wansensoft/datasource/entities/UserBusinessExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/UserBusinessExample.java rename to src/main/java/com/wansensoft/datasource/entities/UserBusinessExample.java index 5f67fa97..fad644c9 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/UserBusinessExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/UserBusinessExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/UserEx.java b/src/main/java/com/wansensoft/datasource/entities/UserEx.java similarity index 97% rename from src/main/java/com/wansensoft/erp/datasource/entities/UserEx.java rename to src/main/java/com/wansensoft/datasource/entities/UserEx.java index b744dba2..6feba499 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/UserEx.java +++ b/src/main/java/com/wansensoft/datasource/entities/UserEx.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; /** * Description diff --git a/src/main/java/com/wansensoft/erp/datasource/entities/UserExample.java b/src/main/java/com/wansensoft/datasource/entities/UserExample.java similarity index 99% rename from src/main/java/com/wansensoft/erp/datasource/entities/UserExample.java rename to src/main/java/com/wansensoft/datasource/entities/UserExample.java index 819cadb6..edbddcab 100644 --- a/src/main/java/com/wansensoft/erp/datasource/entities/UserExample.java +++ b/src/main/java/com/wansensoft/datasource/entities/UserExample.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.entities; +package com.wansensoft.datasource.entities; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/AccountHeadMapper.java b/src/main/java/com/wansensoft/datasource/mappers/AccountHeadMapper.java similarity index 82% rename from src/main/java/com/wansensoft/erp/datasource/mappers/AccountHeadMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/AccountHeadMapper.java index 1b551ac2..08dee382 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/AccountHeadMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/AccountHeadMapper.java @@ -1,7 +1,7 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.AccountHead; -import com.wansensoft.erp.datasource.entities.AccountHeadExample; +import com.wansensoft.datasource.entities.AccountHead; +import com.wansensoft.datasource.entities.AccountHeadExample; import java.util.List; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/AccountHeadMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/AccountHeadMapperEx.java similarity index 90% rename from src/main/java/com/wansensoft/erp/datasource/mappers/AccountHeadMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/AccountHeadMapperEx.java index f6c01f43..1a31ced4 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/AccountHeadMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/AccountHeadMapperEx.java @@ -1,8 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.AccountHead; -import com.wansensoft.erp.datasource.entities.AccountHeadVo4ListEx; -import com.wansensoft.erp.datasource.entities.AccountItem; +import com.wansensoft.datasource.entities.AccountHead; +import com.wansensoft.datasource.entities.AccountHeadVo4ListEx; +import com.wansensoft.datasource.entities.AccountItem; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/AccountItemMapper.java b/src/main/java/com/wansensoft/datasource/mappers/AccountItemMapper.java similarity index 82% rename from src/main/java/com/wansensoft/erp/datasource/mappers/AccountItemMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/AccountItemMapper.java index c6481ad2..9f658f15 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/AccountItemMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/AccountItemMapper.java @@ -1,7 +1,7 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.AccountItem; -import com.wansensoft.erp.datasource.entities.AccountItemExample; +import com.wansensoft.datasource.entities.AccountItem; +import com.wansensoft.datasource.entities.AccountItemExample; import java.util.List; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/AccountItemMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/AccountItemMapperEx.java similarity index 89% rename from src/main/java/com/wansensoft/erp/datasource/mappers/AccountItemMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/AccountItemMapperEx.java index 25891ef6..037b8ea0 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/AccountItemMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/AccountItemMapperEx.java @@ -1,7 +1,7 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.AccountItem; -import com.wansensoft.erp.datasource.vo.AccountItemVo4List; +import com.wansensoft.datasource.entities.AccountItem; +import com.wansensoft.datasource.vo.AccountItemVo4List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/AccountMapper.java b/src/main/java/com/wansensoft/datasource/mappers/AccountMapper.java similarity index 82% rename from src/main/java/com/wansensoft/erp/datasource/mappers/AccountMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/AccountMapper.java index 7b524ea7..f557e823 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/AccountMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/AccountMapper.java @@ -1,7 +1,7 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.Account; -import com.wansensoft.erp.datasource.entities.AccountExample; +import com.wansensoft.datasource.entities.Account; +import com.wansensoft.datasource.entities.AccountExample; import java.util.List; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/AccountMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/AccountMapperEx.java similarity index 83% rename from src/main/java/com/wansensoft/erp/datasource/mappers/AccountMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/AccountMapperEx.java index a375e0b0..af9aee0c 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/AccountMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/AccountMapperEx.java @@ -1,8 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.Account; -import com.wansensoft.erp.datasource.vo.AccountVo4InOutList; -import com.wansensoft.erp.datasource.vo.AccountVo4List; +import com.wansensoft.datasource.entities.Account; +import com.wansensoft.datasource.vo.AccountVo4InOutList; +import com.wansensoft.datasource.vo.AccountVo4List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/DepotHeadMapper.java b/src/main/java/com/wansensoft/datasource/mappers/DepotHeadMapper.java similarity index 81% rename from src/main/java/com/wansensoft/erp/datasource/mappers/DepotHeadMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/DepotHeadMapper.java index 9fde4e62..afbed06e 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/DepotHeadMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/DepotHeadMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.DepotHead; +import com.wansensoft.datasource.entities.DepotHeadExample; -import com.wansensoft.erp.datasource.entities.DepotHead; -import com.wansensoft.erp.datasource.entities.DepotHeadExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/DepotHeadMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/DepotHeadMapperEx.java similarity index 98% rename from src/main/java/com/wansensoft/erp/datasource/mappers/DepotHeadMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/DepotHeadMapperEx.java index 4d274a31..2c99ee6a 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/DepotHeadMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/DepotHeadMapperEx.java @@ -1,7 +1,7 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.DepotHead; -import com.wansensoft.erp.datasource.vo.*; +import com.wansensoft.datasource.entities.DepotHead; +import com.wansensoft.datasource.vo.*; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/DepotItemMapper.java b/src/main/java/com/wansensoft/datasource/mappers/DepotItemMapper.java similarity index 81% rename from src/main/java/com/wansensoft/erp/datasource/mappers/DepotItemMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/DepotItemMapper.java index 049712c5..733ff8f1 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/DepotItemMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/DepotItemMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.DepotItem; +import com.wansensoft.datasource.entities.DepotItemExample; -import com.wansensoft.erp.datasource.entities.DepotItem; -import com.wansensoft.erp.datasource.entities.DepotItemExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/DepotItemMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/DepotItemMapperEx.java similarity index 96% rename from src/main/java/com/wansensoft/erp/datasource/mappers/DepotItemMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/DepotItemMapperEx.java index a9fc747e..15bdb217 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/DepotItemMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/DepotItemMapperEx.java @@ -1,9 +1,9 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.vo.DepotItemStockWarningCount; -import com.wansensoft.erp.datasource.vo.DepotItemVo4Stock; -import com.wansensoft.erp.datasource.vo.DepotItemVoBatchNumberList; -import com.wansensoft.erp.datasource.entities.*; +import com.wansensoft.datasource.entities.*; +import com.wansensoft.datasource.vo.DepotItemStockWarningCount; +import com.wansensoft.datasource.vo.DepotItemVo4Stock; +import com.wansensoft.datasource.vo.DepotItemVoBatchNumberList; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/DepotMapper.java b/src/main/java/com/wansensoft/datasource/mappers/DepotMapper.java similarity index 81% rename from src/main/java/com/wansensoft/erp/datasource/mappers/DepotMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/DepotMapper.java index b29b1f2a..ef549e74 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/DepotMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/DepotMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.Depot; +import com.wansensoft.datasource.entities.DepotExample; -import com.wansensoft.erp.datasource.entities.Depot; -import com.wansensoft.erp.datasource.entities.DepotExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/DepotMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/DepotMapperEx.java similarity index 86% rename from src/main/java/com/wansensoft/erp/datasource/mappers/DepotMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/DepotMapperEx.java index 5672be52..3cd0f423 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/DepotMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/DepotMapperEx.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.DepotEx; +import com.wansensoft.datasource.entities.DepotEx; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/FunctionMapper.java b/src/main/java/com/wansensoft/datasource/mappers/FunctionMapper.java similarity index 81% rename from src/main/java/com/wansensoft/erp/datasource/mappers/FunctionMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/FunctionMapper.java index b2c0fc06..3216b8b7 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/FunctionMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/FunctionMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.Function; +import com.wansensoft.datasource.entities.FunctionExample; -import com.wansensoft.erp.datasource.entities.Function; -import com.wansensoft.erp.datasource.entities.FunctionExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/FunctionMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/FunctionMapperEx.java similarity index 84% rename from src/main/java/com/wansensoft/erp/datasource/mappers/FunctionMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/FunctionMapperEx.java index 87e08418..899dd9f3 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/FunctionMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/FunctionMapperEx.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.FunctionEx; +import com.wansensoft.datasource.entities.FunctionEx; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/InOutItemMapper.java b/src/main/java/com/wansensoft/datasource/mappers/InOutItemMapper.java similarity index 81% rename from src/main/java/com/wansensoft/erp/datasource/mappers/InOutItemMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/InOutItemMapper.java index 26ff8eb1..19c9e2d3 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/InOutItemMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/InOutItemMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.InOutItem; +import com.wansensoft.datasource.entities.InOutItemExample; -import com.wansensoft.erp.datasource.entities.InOutItem; -import com.wansensoft.erp.datasource.entities.InOutItemExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/InOutItemMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/InOutItemMapperEx.java similarity index 86% rename from src/main/java/com/wansensoft/erp/datasource/mappers/InOutItemMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/InOutItemMapperEx.java index d3eefa20..09ff8c48 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/InOutItemMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/InOutItemMapperEx.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.InOutItem; +import com.wansensoft.datasource.entities.InOutItem; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/LogMapper.java b/src/main/java/com/wansensoft/datasource/mappers/LogMapper.java similarity index 81% rename from src/main/java/com/wansensoft/erp/datasource/mappers/LogMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/LogMapper.java index 104729ab..322cd2c0 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/LogMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/LogMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.Log; +import com.wansensoft.datasource.entities.LogExample; -import com.wansensoft.erp.datasource.entities.Log; -import com.wansensoft.erp.datasource.entities.LogExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/LogMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/LogMapperEx.java similarity index 88% rename from src/main/java/com/wansensoft/erp/datasource/mappers/LogMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/LogMapperEx.java index ce38c69f..d3a78a64 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/LogMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/LogMapperEx.java @@ -1,7 +1,7 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.Log; -import com.wansensoft.erp.datasource.vo.LogVo4List; +import com.wansensoft.datasource.entities.Log; +import com.wansensoft.datasource.vo.LogVo4List; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialAttributeMapper.java b/src/main/java/com/wansensoft/datasource/mappers/MaterialAttributeMapper.java similarity index 82% rename from src/main/java/com/wansensoft/erp/datasource/mappers/MaterialAttributeMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/MaterialAttributeMapper.java index 5048cb55..36680445 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialAttributeMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/MaterialAttributeMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.MaterialAttribute; +import com.wansensoft.datasource.entities.MaterialAttributeExample; -import com.wansensoft.erp.datasource.entities.MaterialAttribute; -import com.wansensoft.erp.datasource.entities.MaterialAttributeExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialAttributeMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/MaterialAttributeMapperEx.java similarity index 81% rename from src/main/java/com/wansensoft/erp/datasource/mappers/MaterialAttributeMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/MaterialAttributeMapperEx.java index ee4b5a3f..9e2fd386 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialAttributeMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/MaterialAttributeMapperEx.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.MaterialAttribute; +import com.wansensoft.datasource.entities.MaterialAttribute; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialCategoryMapper.java b/src/main/java/com/wansensoft/datasource/mappers/MaterialCategoryMapper.java similarity index 82% rename from src/main/java/com/wansensoft/erp/datasource/mappers/MaterialCategoryMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/MaterialCategoryMapper.java index c2170c17..21f952fd 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialCategoryMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/MaterialCategoryMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.MaterialCategory; +import com.wansensoft.datasource.entities.MaterialCategoryExample; -import com.wansensoft.erp.datasource.entities.MaterialCategory; -import com.wansensoft.erp.datasource.entities.MaterialCategoryExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialCategoryMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/MaterialCategoryMapperEx.java similarity index 88% rename from src/main/java/com/wansensoft/erp/datasource/mappers/MaterialCategoryMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/MaterialCategoryMapperEx.java index bded1db6..6653b56e 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialCategoryMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/MaterialCategoryMapperEx.java @@ -1,7 +1,7 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.MaterialCategory; -import com.wansensoft.erp.datasource.vo.TreeNode; +import com.wansensoft.datasource.entities.MaterialCategory; +import com.wansensoft.datasource.vo.TreeNode; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialCurrentStockMapper.java b/src/main/java/com/wansensoft/datasource/mappers/MaterialCurrentStockMapper.java similarity index 82% rename from src/main/java/com/wansensoft/erp/datasource/mappers/MaterialCurrentStockMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/MaterialCurrentStockMapper.java index 94ab2567..4399667a 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialCurrentStockMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/MaterialCurrentStockMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.MaterialCurrentStock; +import com.wansensoft.datasource.entities.MaterialCurrentStockExample; -import com.wansensoft.erp.datasource.entities.MaterialCurrentStock; -import com.wansensoft.erp.datasource.entities.MaterialCurrentStockExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialCurrentStockMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/MaterialCurrentStockMapperEx.java similarity index 72% rename from src/main/java/com/wansensoft/erp/datasource/mappers/MaterialCurrentStockMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/MaterialCurrentStockMapperEx.java index aa48c029..eda49fc2 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialCurrentStockMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/MaterialCurrentStockMapperEx.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.MaterialCurrentStock; +import com.wansensoft.datasource.entities.MaterialCurrentStock; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialExtendMapper.java b/src/main/java/com/wansensoft/datasource/mappers/MaterialExtendMapper.java similarity index 82% rename from src/main/java/com/wansensoft/erp/datasource/mappers/MaterialExtendMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/MaterialExtendMapper.java index 05a0d3da..2686e0b7 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialExtendMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/MaterialExtendMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.MaterialExtend; +import com.wansensoft.datasource.entities.MaterialExtendExample; -import com.wansensoft.erp.datasource.entities.MaterialExtend; -import com.wansensoft.erp.datasource.entities.MaterialExtendExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialExtendMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/MaterialExtendMapperEx.java similarity index 78% rename from src/main/java/com/wansensoft/erp/datasource/mappers/MaterialExtendMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/MaterialExtendMapperEx.java index e85dd623..9d466e11 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialExtendMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/MaterialExtendMapperEx.java @@ -1,7 +1,7 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.MaterialExtend; -import com.wansensoft.erp.datasource.vo.MaterialExtendVo4List; +import com.wansensoft.datasource.entities.MaterialExtend; +import com.wansensoft.datasource.vo.MaterialExtendVo4List; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialInitialStockMapper.java b/src/main/java/com/wansensoft/datasource/mappers/MaterialInitialStockMapper.java similarity index 82% rename from src/main/java/com/wansensoft/erp/datasource/mappers/MaterialInitialStockMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/MaterialInitialStockMapper.java index d8eca7bc..9999d45a 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialInitialStockMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/MaterialInitialStockMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.MaterialInitialStock; +import com.wansensoft.datasource.entities.MaterialInitialStockExample; -import com.wansensoft.erp.datasource.entities.MaterialInitialStock; -import com.wansensoft.erp.datasource.entities.MaterialInitialStockExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialInitialStockMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/MaterialInitialStockMapperEx.java similarity index 61% rename from src/main/java/com/wansensoft/erp/datasource/mappers/MaterialInitialStockMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/MaterialInitialStockMapperEx.java index a2949940..537f14e1 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialInitialStockMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/MaterialInitialStockMapperEx.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.MaterialInitialStock; +import com.wansensoft.datasource.entities.MaterialInitialStock; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialMapper.java b/src/main/java/com/wansensoft/datasource/mappers/MaterialMapper.java similarity index 81% rename from src/main/java/com/wansensoft/erp/datasource/mappers/MaterialMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/MaterialMapper.java index 65e3d0f0..42af2d92 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/MaterialMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.Material; +import com.wansensoft.datasource.entities.MaterialExample; -import com.wansensoft.erp.datasource.entities.Material; -import com.wansensoft.erp.datasource.entities.MaterialExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/MaterialMapperEx.java similarity index 97% rename from src/main/java/com/wansensoft/erp/datasource/mappers/MaterialMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/MaterialMapperEx.java index cd4ea8d8..b83d9c0e 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/MaterialMapperEx.java @@ -1,7 +1,7 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.vo.MaterialVoSearch; -import com.wansensoft.erp.datasource.entities.*; +import com.wansensoft.datasource.entities.*; +import com.wansensoft.datasource.vo.MaterialVoSearch; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialPropertyMapper.java b/src/main/java/com/wansensoft/datasource/mappers/MaterialPropertyMapper.java similarity index 82% rename from src/main/java/com/wansensoft/erp/datasource/mappers/MaterialPropertyMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/MaterialPropertyMapper.java index b32cd816..8bacdabe 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialPropertyMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/MaterialPropertyMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.MaterialProperty; +import com.wansensoft.datasource.entities.MaterialPropertyExample; -import com.wansensoft.erp.datasource.entities.MaterialProperty; -import com.wansensoft.erp.datasource.entities.MaterialPropertyExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialPropertyMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/MaterialPropertyMapperEx.java similarity index 82% rename from src/main/java/com/wansensoft/erp/datasource/mappers/MaterialPropertyMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/MaterialPropertyMapperEx.java index 8891a04a..06d81ad0 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/MaterialPropertyMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/MaterialPropertyMapperEx.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.MaterialProperty; +import com.wansensoft.datasource.entities.MaterialProperty; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/MsgMapper.java b/src/main/java/com/wansensoft/datasource/mappers/MsgMapper.java similarity index 81% rename from src/main/java/com/wansensoft/erp/datasource/mappers/MsgMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/MsgMapper.java index 81cc88c2..f36a9407 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/MsgMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/MsgMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.Msg; +import com.wansensoft.datasource.entities.MsgExample; -import com.wansensoft.erp.datasource.entities.Msg; -import com.wansensoft.erp.datasource.entities.MsgExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/MsgMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/MsgMapperEx.java similarity index 85% rename from src/main/java/com/wansensoft/erp/datasource/mappers/MsgMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/MsgMapperEx.java index 9aa32cee..a82dfeda 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/MsgMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/MsgMapperEx.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.MsgEx; +import com.wansensoft.datasource.entities.MsgEx; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/OrgaUserRelMapper.java b/src/main/java/com/wansensoft/datasource/mappers/OrgaUserRelMapper.java similarity index 93% rename from src/main/java/com/wansensoft/erp/datasource/mappers/OrgaUserRelMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/OrgaUserRelMapper.java index d028e616..76e646db 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/OrgaUserRelMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/OrgaUserRelMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.OrgaUserRel; +import com.wansensoft.datasource.entities.OrgaUserRelExample; -import com.wansensoft.erp.datasource.entities.OrgaUserRel; -import com.wansensoft.erp.datasource.entities.OrgaUserRelExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/OrgaUserRelMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/OrgaUserRelMapperEx.java similarity index 66% rename from src/main/java/com/wansensoft/erp/datasource/mappers/OrgaUserRelMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/OrgaUserRelMapperEx.java index 83a53320..617e50a3 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/OrgaUserRelMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/OrgaUserRelMapperEx.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.OrgaUserRel; +import com.wansensoft.datasource.entities.OrgaUserRel; /** * Description diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/OrganizationMapper.java b/src/main/java/com/wansensoft/datasource/mappers/OrganizationMapper.java similarity index 82% rename from src/main/java/com/wansensoft/erp/datasource/mappers/OrganizationMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/OrganizationMapper.java index 3aa3ded9..5263498d 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/OrganizationMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/OrganizationMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.Organization; +import com.wansensoft.datasource.entities.OrganizationExample; -import com.wansensoft.erp.datasource.entities.Organization; -import com.wansensoft.erp.datasource.entities.OrganizationExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/OrganizationMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/OrganizationMapperEx.java similarity index 82% rename from src/main/java/com/wansensoft/erp/datasource/mappers/OrganizationMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/OrganizationMapperEx.java index 8ccba459..709b70f0 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/OrganizationMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/OrganizationMapperEx.java @@ -1,7 +1,7 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.Organization; -import com.wansensoft.erp.datasource.vo.TreeNode; +import com.wansensoft.datasource.entities.Organization; +import com.wansensoft.datasource.vo.TreeNode; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/PersonMapper.java b/src/main/java/com/wansensoft/datasource/mappers/PersonMapper.java similarity index 81% rename from src/main/java/com/wansensoft/erp/datasource/mappers/PersonMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/PersonMapper.java index a7e63177..9fcc4b74 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/PersonMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/PersonMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.Person; +import com.wansensoft.datasource.entities.PersonExample; -import com.wansensoft.erp.datasource.entities.Person; -import com.wansensoft.erp.datasource.entities.PersonExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/PersonMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/PersonMapperEx.java similarity index 82% rename from src/main/java/com/wansensoft/erp/datasource/mappers/PersonMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/PersonMapperEx.java index 056acb89..d17a9a0b 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/PersonMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/PersonMapperEx.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.Person; +import com.wansensoft.datasource.entities.Person; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/PlatformConfigMapper.java b/src/main/java/com/wansensoft/datasource/mappers/PlatformConfigMapper.java similarity index 82% rename from src/main/java/com/wansensoft/erp/datasource/mappers/PlatformConfigMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/PlatformConfigMapper.java index 044a809e..32363e96 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/PlatformConfigMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/PlatformConfigMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.PlatformConfig; +import com.wansensoft.datasource.entities.PlatformConfigExample; -import com.wansensoft.erp.datasource.entities.PlatformConfig; -import com.wansensoft.erp.datasource.entities.PlatformConfigExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/PlatformConfigMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/PlatformConfigMapperEx.java similarity index 78% rename from src/main/java/com/wansensoft/erp/datasource/mappers/PlatformConfigMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/PlatformConfigMapperEx.java index e4b32c81..1c9a9da3 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/PlatformConfigMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/PlatformConfigMapperEx.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.PlatformConfig; +import com.wansensoft.datasource.entities.PlatformConfig; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/RoleMapper.java b/src/main/java/com/wansensoft/datasource/mappers/RoleMapper.java similarity index 81% rename from src/main/java/com/wansensoft/erp/datasource/mappers/RoleMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/RoleMapper.java index 3d7db233..be5d8b51 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/RoleMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/RoleMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.Role; +import com.wansensoft.datasource.entities.RoleExample; -import com.wansensoft.erp.datasource.entities.Role; -import com.wansensoft.erp.datasource.entities.RoleExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/RoleMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/RoleMapperEx.java similarity index 81% rename from src/main/java/com/wansensoft/erp/datasource/mappers/RoleMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/RoleMapperEx.java index f25991c4..20d1c48a 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/RoleMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/RoleMapperEx.java @@ -1,7 +1,7 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.Role; -import com.wansensoft.erp.datasource.entities.RoleEx; +import com.wansensoft.datasource.entities.Role; +import com.wansensoft.datasource.entities.RoleEx; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/SequenceMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/SequenceMapperEx.java similarity index 84% rename from src/main/java/com/wansensoft/erp/datasource/mappers/SequenceMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/SequenceMapperEx.java index 109704a2..c0834a6d 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/SequenceMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/SequenceMapperEx.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/SerialNumberMapper.java b/src/main/java/com/wansensoft/datasource/mappers/SerialNumberMapper.java similarity index 82% rename from src/main/java/com/wansensoft/erp/datasource/mappers/SerialNumberMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/SerialNumberMapper.java index 57eb198b..9cb11666 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/SerialNumberMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/SerialNumberMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.SerialNumber; +import com.wansensoft.datasource.entities.SerialNumberExample; -import com.wansensoft.erp.datasource.entities.SerialNumber; -import com.wansensoft.erp.datasource.entities.SerialNumberExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/SerialNumberMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/SerialNumberMapperEx.java similarity index 95% rename from src/main/java/com/wansensoft/erp/datasource/mappers/SerialNumberMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/SerialNumberMapperEx.java index fae492c3..99e46326 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/SerialNumberMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/SerialNumberMapperEx.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.SerialNumberEx; +import com.wansensoft.datasource.entities.SerialNumberEx; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/SupplierMapper.java b/src/main/java/com/wansensoft/datasource/mappers/SupplierMapper.java similarity index 81% rename from src/main/java/com/wansensoft/erp/datasource/mappers/SupplierMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/SupplierMapper.java index 230f4133..388c1aad 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/SupplierMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/SupplierMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.Supplier; +import com.wansensoft.datasource.entities.SupplierExample; -import com.wansensoft.erp.datasource.entities.Supplier; -import com.wansensoft.erp.datasource.entities.SupplierExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/SupplierMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/SupplierMapperEx.java similarity index 92% rename from src/main/java/com/wansensoft/erp/datasource/mappers/SupplierMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/SupplierMapperEx.java index bbf373c4..f64ffcbf 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/SupplierMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/SupplierMapperEx.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.Supplier; +import com.wansensoft.datasource.entities.Supplier; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/SystemConfigMapper.java b/src/main/java/com/wansensoft/datasource/mappers/SystemConfigMapper.java similarity index 82% rename from src/main/java/com/wansensoft/erp/datasource/mappers/SystemConfigMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/SystemConfigMapper.java index 788cc3b4..362adf50 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/SystemConfigMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/SystemConfigMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.SystemConfig; +import com.wansensoft.datasource.entities.SystemConfigExample; -import com.wansensoft.erp.datasource.entities.SystemConfig; -import com.wansensoft.erp.datasource.entities.SystemConfigExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/SystemConfigMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/SystemConfigMapperEx.java similarity index 83% rename from src/main/java/com/wansensoft/erp/datasource/mappers/SystemConfigMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/SystemConfigMapperEx.java index c0a82059..93155e71 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/SystemConfigMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/SystemConfigMapperEx.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.SystemConfig; +import com.wansensoft.datasource.entities.SystemConfig; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/TenantMapper.java b/src/main/java/com/wansensoft/datasource/mappers/TenantMapper.java similarity index 81% rename from src/main/java/com/wansensoft/erp/datasource/mappers/TenantMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/TenantMapper.java index 63bb31d5..a2e84c61 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/TenantMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/TenantMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.Tenant; +import com.wansensoft.datasource.entities.TenantExample; -import com.wansensoft.erp.datasource.entities.Tenant; -import com.wansensoft.erp.datasource.entities.TenantExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/TenantMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/TenantMapperEx.java similarity index 85% rename from src/main/java/com/wansensoft/erp/datasource/mappers/TenantMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/TenantMapperEx.java index fea3345e..c925a840 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/TenantMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/TenantMapperEx.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.TenantEx; +import com.wansensoft.datasource.entities.TenantEx; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/UnitMapper.java b/src/main/java/com/wansensoft/datasource/mappers/UnitMapper.java similarity index 81% rename from src/main/java/com/wansensoft/erp/datasource/mappers/UnitMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/UnitMapper.java index ed2ccd43..e0dd654b 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/UnitMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/UnitMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.Unit; +import com.wansensoft.datasource.entities.UnitExample; -import com.wansensoft.erp.datasource.entities.Unit; -import com.wansensoft.erp.datasource.entities.UnitExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/UnitMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/UnitMapperEx.java similarity index 85% rename from src/main/java/com/wansensoft/erp/datasource/mappers/UnitMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/UnitMapperEx.java index b7fcfea3..5785785e 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/UnitMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/UnitMapperEx.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.Unit; +import com.wansensoft.datasource.entities.Unit; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/UserBusinessMapper.java b/src/main/java/com/wansensoft/datasource/mappers/UserBusinessMapper.java similarity index 82% rename from src/main/java/com/wansensoft/erp/datasource/mappers/UserBusinessMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/UserBusinessMapper.java index 8e12ea9c..d5a81a02 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/UserBusinessMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/UserBusinessMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.UserBusiness; +import com.wansensoft.datasource.entities.UserBusinessExample; -import com.wansensoft.erp.datasource.entities.UserBusiness; -import com.wansensoft.erp.datasource.entities.UserBusinessExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/UserBusinessMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/UserBusinessMapperEx.java similarity index 87% rename from src/main/java/com/wansensoft/erp/datasource/mappers/UserBusinessMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/UserBusinessMapperEx.java index 6929f464..ced758be 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/UserBusinessMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/UserBusinessMapperEx.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/UserMapper.java b/src/main/java/com/wansensoft/datasource/mappers/UserMapper.java similarity index 81% rename from src/main/java/com/wansensoft/erp/datasource/mappers/UserMapper.java rename to src/main/java/com/wansensoft/datasource/mappers/UserMapper.java index f8c57582..20ebdd9e 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/UserMapper.java +++ b/src/main/java/com/wansensoft/datasource/mappers/UserMapper.java @@ -1,7 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; + +import com.wansensoft.datasource.entities.User; +import com.wansensoft.datasource.entities.UserExample; -import com.wansensoft.erp.datasource.entities.User; -import com.wansensoft.erp.datasource.entities.UserExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wansensoft/erp/datasource/mappers/UserMapperEx.java b/src/main/java/com/wansensoft/datasource/mappers/UserMapperEx.java similarity index 86% rename from src/main/java/com/wansensoft/erp/datasource/mappers/UserMapperEx.java rename to src/main/java/com/wansensoft/datasource/mappers/UserMapperEx.java index 714568e3..c79cbcb6 100644 --- a/src/main/java/com/wansensoft/erp/datasource/mappers/UserMapperEx.java +++ b/src/main/java/com/wansensoft/datasource/mappers/UserMapperEx.java @@ -1,8 +1,8 @@ -package com.wansensoft.erp.datasource.mappers; +package com.wansensoft.datasource.mappers; -import com.wansensoft.erp.datasource.entities.User; -import com.wansensoft.erp.datasource.entities.UserEx; -import com.wansensoft.erp.datasource.vo.TreeNodeEx; +import com.wansensoft.datasource.entities.User; +import com.wansensoft.datasource.entities.UserEx; +import com.wansensoft.datasource.vo.TreeNodeEx; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/AccountItemVo4List.java b/src/main/java/com/wansensoft/datasource/vo/AccountItemVo4List.java similarity index 87% rename from src/main/java/com/wansensoft/erp/datasource/vo/AccountItemVo4List.java rename to src/main/java/com/wansensoft/datasource/vo/AccountItemVo4List.java index d27f489a..f632e9e5 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/AccountItemVo4List.java +++ b/src/main/java/com/wansensoft/datasource/vo/AccountItemVo4List.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; -import com.wansensoft.erp.datasource.entities.AccountItem; +import com.wansensoft.datasource.entities.AccountItem; public class AccountItemVo4List extends AccountItem { diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/AccountVo4InOutList.java b/src/main/java/com/wansensoft/datasource/vo/AccountVo4InOutList.java similarity index 98% rename from src/main/java/com/wansensoft/erp/datasource/vo/AccountVo4InOutList.java rename to src/main/java/com/wansensoft/datasource/vo/AccountVo4InOutList.java index bf5d4b99..04eb7b71 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/AccountVo4InOutList.java +++ b/src/main/java/com/wansensoft/datasource/vo/AccountVo4InOutList.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/AccountVo4List.java b/src/main/java/com/wansensoft/datasource/vo/AccountVo4List.java similarity index 74% rename from src/main/java/com/wansensoft/erp/datasource/vo/AccountVo4List.java rename to src/main/java/com/wansensoft/datasource/vo/AccountVo4List.java index 0e5bf006..9885495f 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/AccountVo4List.java +++ b/src/main/java/com/wansensoft/datasource/vo/AccountVo4List.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; -import com.wansensoft.erp.datasource.entities.Account; +import com.wansensoft.datasource.entities.Account; public class AccountVo4List extends Account { diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/DepotHeadVo4InDetail.java b/src/main/java/com/wansensoft/datasource/vo/DepotHeadVo4InDetail.java similarity index 98% rename from src/main/java/com/wansensoft/erp/datasource/vo/DepotHeadVo4InDetail.java rename to src/main/java/com/wansensoft/datasource/vo/DepotHeadVo4InDetail.java index 8a80463b..4e295035 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/DepotHeadVo4InDetail.java +++ b/src/main/java/com/wansensoft/datasource/vo/DepotHeadVo4InDetail.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/DepotHeadVo4InOutMCount.java b/src/main/java/com/wansensoft/datasource/vo/DepotHeadVo4InOutMCount.java similarity index 97% rename from src/main/java/com/wansensoft/erp/datasource/vo/DepotHeadVo4InOutMCount.java rename to src/main/java/com/wansensoft/datasource/vo/DepotHeadVo4InOutMCount.java index e8f1dccc..4902e0d1 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/DepotHeadVo4InOutMCount.java +++ b/src/main/java/com/wansensoft/datasource/vo/DepotHeadVo4InOutMCount.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/DepotHeadVo4List.java b/src/main/java/com/wansensoft/datasource/vo/DepotHeadVo4List.java similarity index 97% rename from src/main/java/com/wansensoft/erp/datasource/vo/DepotHeadVo4List.java rename to src/main/java/com/wansensoft/datasource/vo/DepotHeadVo4List.java index 3317cc7d..edac781a 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/DepotHeadVo4List.java +++ b/src/main/java/com/wansensoft/datasource/vo/DepotHeadVo4List.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; -import com.wansensoft.erp.datasource.entities.DepotHead; +import com.wansensoft.datasource.entities.DepotHead; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/DepotHeadVo4StatementAccount.java b/src/main/java/com/wansensoft/datasource/vo/DepotHeadVo4StatementAccount.java similarity index 98% rename from src/main/java/com/wansensoft/erp/datasource/vo/DepotHeadVo4StatementAccount.java rename to src/main/java/com/wansensoft/datasource/vo/DepotHeadVo4StatementAccount.java index bc8a8999..5b6a0e2f 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/DepotHeadVo4StatementAccount.java +++ b/src/main/java/com/wansensoft/datasource/vo/DepotHeadVo4StatementAccount.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/DepotItemStockWarningCount.java b/src/main/java/com/wansensoft/datasource/vo/DepotItemStockWarningCount.java similarity index 98% rename from src/main/java/com/wansensoft/erp/datasource/vo/DepotItemStockWarningCount.java rename to src/main/java/com/wansensoft/datasource/vo/DepotItemStockWarningCount.java index bb6e51f0..e455db6a 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/DepotItemStockWarningCount.java +++ b/src/main/java/com/wansensoft/datasource/vo/DepotItemStockWarningCount.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/DepotItemVo4Stock.java b/src/main/java/com/wansensoft/datasource/vo/DepotItemVo4Stock.java similarity index 97% rename from src/main/java/com/wansensoft/erp/datasource/vo/DepotItemVo4Stock.java rename to src/main/java/com/wansensoft/datasource/vo/DepotItemVo4Stock.java index 97b9ec61..618cfe44 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/DepotItemVo4Stock.java +++ b/src/main/java/com/wansensoft/datasource/vo/DepotItemVo4Stock.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/DepotItemVoBatchNumberList.java b/src/main/java/com/wansensoft/datasource/vo/DepotItemVoBatchNumberList.java similarity index 98% rename from src/main/java/com/wansensoft/erp/datasource/vo/DepotItemVoBatchNumberList.java rename to src/main/java/com/wansensoft/datasource/vo/DepotItemVoBatchNumberList.java index 080e9720..c9b2559d 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/DepotItemVoBatchNumberList.java +++ b/src/main/java/com/wansensoft/datasource/vo/DepotItemVoBatchNumberList.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/FinishDepositVo.java b/src/main/java/com/wansensoft/datasource/vo/FinishDepositVo.java similarity index 91% rename from src/main/java/com/wansensoft/erp/datasource/vo/FinishDepositVo.java rename to src/main/java/com/wansensoft/datasource/vo/FinishDepositVo.java index dd61b679..1426e61d 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/FinishDepositVo.java +++ b/src/main/java/com/wansensoft/datasource/vo/FinishDepositVo.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/LogVo4List.java b/src/main/java/com/wansensoft/datasource/vo/LogVo4List.java similarity index 87% rename from src/main/java/com/wansensoft/erp/datasource/vo/LogVo4List.java rename to src/main/java/com/wansensoft/datasource/vo/LogVo4List.java index bd025e7b..2de74d93 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/LogVo4List.java +++ b/src/main/java/com/wansensoft/datasource/vo/LogVo4List.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; -import com.wansensoft.erp.datasource.entities.Log; +import com.wansensoft.datasource.entities.Log; public class LogVo4List extends Log { diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/MaterialCountVo.java b/src/main/java/com/wansensoft/datasource/vo/MaterialCountVo.java similarity index 91% rename from src/main/java/com/wansensoft/erp/datasource/vo/MaterialCountVo.java rename to src/main/java/com/wansensoft/datasource/vo/MaterialCountVo.java index d5547dd8..b778a4fd 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/MaterialCountVo.java +++ b/src/main/java/com/wansensoft/datasource/vo/MaterialCountVo.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/MaterialExtendVo4List.java b/src/main/java/com/wansensoft/datasource/vo/MaterialExtendVo4List.java similarity index 92% rename from src/main/java/com/wansensoft/erp/datasource/vo/MaterialExtendVo4List.java rename to src/main/java/com/wansensoft/datasource/vo/MaterialExtendVo4List.java index 0906d687..669cb56c 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/MaterialExtendVo4List.java +++ b/src/main/java/com/wansensoft/datasource/vo/MaterialExtendVo4List.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; -import com.wansensoft.erp.datasource.entities.MaterialExtend; +import com.wansensoft.datasource.entities.MaterialExtend; import java.math.BigDecimal; diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/MaterialVoSearch.java b/src/main/java/com/wansensoft/datasource/vo/MaterialVoSearch.java similarity index 96% rename from src/main/java/com/wansensoft/erp/datasource/vo/MaterialVoSearch.java rename to src/main/java/com/wansensoft/datasource/vo/MaterialVoSearch.java index 189e7d83..776aae5d 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/MaterialVoSearch.java +++ b/src/main/java/com/wansensoft/datasource/vo/MaterialVoSearch.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; public class MaterialVoSearch { diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/MaterialsListVo.java b/src/main/java/com/wansensoft/datasource/vo/MaterialsListVo.java similarity index 91% rename from src/main/java/com/wansensoft/erp/datasource/vo/MaterialsListVo.java rename to src/main/java/com/wansensoft/datasource/vo/MaterialsListVo.java index 87fa27b8..eaf4459b 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/MaterialsListVo.java +++ b/src/main/java/com/wansensoft/datasource/vo/MaterialsListVo.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; public class MaterialsListVo { diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/NodeAttributes.java b/src/main/java/com/wansensoft/datasource/vo/NodeAttributes.java similarity index 91% rename from src/main/java/com/wansensoft/erp/datasource/vo/NodeAttributes.java rename to src/main/java/com/wansensoft/datasource/vo/NodeAttributes.java index a7844ecc..27e561d2 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/NodeAttributes.java +++ b/src/main/java/com/wansensoft/datasource/vo/NodeAttributes.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; /** * Description diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/TreeNode.java b/src/main/java/com/wansensoft/datasource/vo/TreeNode.java similarity index 98% rename from src/main/java/com/wansensoft/erp/datasource/vo/TreeNode.java rename to src/main/java/com/wansensoft/datasource/vo/TreeNode.java index 8dbf3383..5ffe2fb8 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/TreeNode.java +++ b/src/main/java/com/wansensoft/datasource/vo/TreeNode.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/datasource/vo/TreeNodeEx.java b/src/main/java/com/wansensoft/datasource/vo/TreeNodeEx.java similarity index 97% rename from src/main/java/com/wansensoft/erp/datasource/vo/TreeNodeEx.java rename to src/main/java/com/wansensoft/datasource/vo/TreeNodeEx.java index 86e748c5..15028ac1 100644 --- a/src/main/java/com/wansensoft/erp/datasource/vo/TreeNodeEx.java +++ b/src/main/java/com/wansensoft/datasource/vo/TreeNodeEx.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.datasource.vo; +package com.wansensoft.datasource.vo; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/exception/BusinessParamCheckingException.java b/src/main/java/com/wansensoft/exception/BusinessParamCheckingException.java similarity index 95% rename from src/main/java/com/wansensoft/erp/exception/BusinessParamCheckingException.java rename to src/main/java/com/wansensoft/exception/BusinessParamCheckingException.java index 634f12f3..e450b633 100644 --- a/src/main/java/com/wansensoft/erp/exception/BusinessParamCheckingException.java +++ b/src/main/java/com/wansensoft/exception/BusinessParamCheckingException.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.exception; +package com.wansensoft.exception; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/wansensoft/erp/exception/BusinessRunTimeException.java b/src/main/java/com/wansensoft/exception/BusinessRunTimeException.java similarity index 95% rename from src/main/java/com/wansensoft/erp/exception/BusinessRunTimeException.java rename to src/main/java/com/wansensoft/exception/BusinessRunTimeException.java index a4cc7d01..08fd7759 100644 --- a/src/main/java/com/wansensoft/erp/exception/BusinessRunTimeException.java +++ b/src/main/java/com/wansensoft/exception/BusinessRunTimeException.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.exception; +package com.wansensoft.exception; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/wansensoft/erp/exception/GlobalExceptionHandler.java b/src/main/java/com/wansensoft/exception/GlobalExceptionHandler.java similarity index 95% rename from src/main/java/com/wansensoft/erp/exception/GlobalExceptionHandler.java rename to src/main/java/com/wansensoft/exception/GlobalExceptionHandler.java index adabbbd0..9be0112e 100644 --- a/src/main/java/com/wansensoft/erp/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/wansensoft/exception/GlobalExceptionHandler.java @@ -1,7 +1,7 @@ -package com.wansensoft.erp.exception; +package com.wansensoft.exception; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.ExceptionConstants; +import com.wansensoft.constants.ExceptionConstants; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; diff --git a/src/main/java/com/wansensoft/erp/exception/JshException.java b/src/main/java/com/wansensoft/exception/JshException.java similarity index 90% rename from src/main/java/com/wansensoft/erp/exception/JshException.java rename to src/main/java/com/wansensoft/exception/JshException.java index 06368459..2a36e419 100644 --- a/src/main/java/com/wansensoft/erp/exception/JshException.java +++ b/src/main/java/com/wansensoft/exception/JshException.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.exception; +package com.wansensoft.exception; -import com.wansensoft.erp.constants.ExceptionConstants; +import com.wansensoft.constants.ExceptionConstants; import org.slf4j.Logger; /** diff --git a/src/main/java/com/wansensoft/erp/filter/LogCostFilter.java b/src/main/java/com/wansensoft/filter/LogCostFilter.java similarity index 97% rename from src/main/java/com/wansensoft/erp/filter/LogCostFilter.java rename to src/main/java/com/wansensoft/filter/LogCostFilter.java index 60106424..fd105956 100644 --- a/src/main/java/com/wansensoft/erp/filter/LogCostFilter.java +++ b/src/main/java/com/wansensoft/filter/LogCostFilter.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.filter; +package com.wansensoft.filter; -import com.wansensoft.erp.service.redis.RedisService; +import com.wansensoft.service.redis.RedisService; import jakarta.servlet.annotation.WebFilter; import jakarta.servlet.annotation.WebInitParam; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/wansensoft/erp/service/CommonQueryManager.java b/src/main/java/com/wansensoft/service/CommonQueryManager.java similarity index 95% rename from src/main/java/com/wansensoft/erp/service/CommonQueryManager.java rename to src/main/java/com/wansensoft/service/CommonQueryManager.java index cde936a9..f290d570 100644 --- a/src/main/java/com/wansensoft/erp/service/CommonQueryManager.java +++ b/src/main/java/com/wansensoft/service/CommonQueryManager.java @@ -1,9 +1,9 @@ -package com.wansensoft.erp.service; +package com.wansensoft.service; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.service.log.LogService; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/wansensoft/erp/service/ICommonQuery.java b/src/main/java/com/wansensoft/service/ICommonQuery.java similarity index 97% rename from src/main/java/com/wansensoft/erp/service/ICommonQuery.java rename to src/main/java/com/wansensoft/service/ICommonQuery.java index 9b16af25..8552fcfd 100644 --- a/src/main/java/com/wansensoft/erp/service/ICommonQuery.java +++ b/src/main/java/com/wansensoft/service/ICommonQuery.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.service; +package com.wansensoft.service; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/wansensoft/erp/service/InterfaceContainer.java b/src/main/java/com/wansensoft/service/InterfaceContainer.java similarity index 90% rename from src/main/java/com/wansensoft/erp/service/InterfaceContainer.java rename to src/main/java/com/wansensoft/service/InterfaceContainer.java index b77dfcc7..6e82e235 100644 --- a/src/main/java/com/wansensoft/erp/service/InterfaceContainer.java +++ b/src/main/java/com/wansensoft/service/InterfaceContainer.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service; +package com.wansensoft.service; -import com.wansensoft.erp.utils.AnnotationUtils; +import com.wansensoft.utils.AnnotationUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/ResourceInfo.java b/src/main/java/com/wansensoft/service/ResourceInfo.java similarity index 87% rename from src/main/java/com/wansensoft/erp/service/ResourceInfo.java rename to src/main/java/com/wansensoft/service/ResourceInfo.java index 31a6b33b..5cac8995 100644 --- a/src/main/java/com/wansensoft/erp/service/ResourceInfo.java +++ b/src/main/java/com/wansensoft/service/ResourceInfo.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.service; +package com.wansensoft.service; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/account/AccountComponent.java b/src/main/java/com/wansensoft/service/account/AccountComponent.java similarity index 91% rename from src/main/java/com/wansensoft/erp/service/account/AccountComponent.java rename to src/main/java/com/wansensoft/service/account/AccountComponent.java index 9ebb7787..d89c5cab 100644 --- a/src/main/java/com/wansensoft/erp/service/account/AccountComponent.java +++ b/src/main/java/com/wansensoft/service/account/AccountComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.account; +package com.wansensoft.service.account; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/account/AccountResource.java b/src/main/java/com/wansensoft/service/account/AccountResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/account/AccountResource.java rename to src/main/java/com/wansensoft/service/account/AccountResource.java index 3ad7524e..8b3ddf15 100644 --- a/src/main/java/com/wansensoft/erp/service/account/AccountResource.java +++ b/src/main/java/com/wansensoft/service/account/AccountResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.account; +package com.wansensoft.service.account; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/account/AccountService.java b/src/main/java/com/wansensoft/service/account/AccountService.java similarity index 97% rename from src/main/java/com/wansensoft/erp/service/account/AccountService.java rename to src/main/java/com/wansensoft/service/account/AccountService.java index 66f05d1a..ef04923e 100644 --- a/src/main/java/com/wansensoft/erp/service/account/AccountService.java +++ b/src/main/java/com/wansensoft/service/account/AccountService.java @@ -1,19 +1,19 @@ -package com.wansensoft.erp.service.account; +package com.wansensoft.service.account; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.*; -import com.wansensoft.erp.datasource.mappers.*; -import com.wansensoft.erp.datasource.vo.AccountVo4InOutList; -import com.wansensoft.erp.datasource.vo.AccountVo4List; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.systemConfig.SystemConfigService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; -import com.wansensoft.erp.utils.Tools; +import com.wansensoft.datasource.entities.*; +import com.wansensoft.datasource.mappers.*; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.vo.AccountVo4InOutList; +import com.wansensoft.datasource.vo.AccountVo4List; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.systemConfig.SystemConfigService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.StringUtil; +import com.wansensoft.utils.Tools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.dao.DataAccessException; diff --git a/src/main/java/com/wansensoft/erp/service/accountHead/AccountHeadComponent.java b/src/main/java/com/wansensoft/service/accountHead/AccountHeadComponent.java similarity index 94% rename from src/main/java/com/wansensoft/erp/service/accountHead/AccountHeadComponent.java rename to src/main/java/com/wansensoft/service/accountHead/AccountHeadComponent.java index 748d32df..2aee0e1d 100644 --- a/src/main/java/com/wansensoft/erp/service/accountHead/AccountHeadComponent.java +++ b/src/main/java/com/wansensoft/service/accountHead/AccountHeadComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.accountHead; +package com.wansensoft.service.accountHead; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/accountHead/AccountHeadResource.java b/src/main/java/com/wansensoft/service/accountHead/AccountHeadResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/accountHead/AccountHeadResource.java rename to src/main/java/com/wansensoft/service/accountHead/AccountHeadResource.java index 8bcffa2d..b6339107 100644 --- a/src/main/java/com/wansensoft/erp/service/accountHead/AccountHeadResource.java +++ b/src/main/java/com/wansensoft/service/accountHead/AccountHeadResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.accountHead; +package com.wansensoft.service.accountHead; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/accountHead/AccountHeadService.java b/src/main/java/com/wansensoft/service/accountHead/AccountHeadService.java similarity index 93% rename from src/main/java/com/wansensoft/erp/service/accountHead/AccountHeadService.java rename to src/main/java/com/wansensoft/service/accountHead/AccountHeadService.java index d8290c61..54fa9b61 100644 --- a/src/main/java/com/wansensoft/erp/service/accountHead/AccountHeadService.java +++ b/src/main/java/com/wansensoft/service/accountHead/AccountHeadService.java @@ -1,22 +1,22 @@ -package com.wansensoft.erp.service.accountHead; +package com.wansensoft.service.accountHead; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.*; -import com.wansensoft.erp.datasource.mappers.AccountHeadMapper; -import com.wansensoft.erp.datasource.mappers.AccountHeadMapperEx; -import com.wansensoft.erp.datasource.mappers.AccountItemMapperEx; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.accountItem.AccountItemService; -import com.wansensoft.erp.service.depotHead.DepotHeadService; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.orgaUserRel.OrgaUserRelService; -import com.wansensoft.erp.service.supplier.SupplierService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; -import com.wansensoft.erp.utils.Tools; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.entities.*; +import com.wansensoft.datasource.mappers.AccountHeadMapper; +import com.wansensoft.datasource.mappers.AccountHeadMapperEx; +import com.wansensoft.datasource.mappers.AccountItemMapperEx; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.accountItem.AccountItemService; +import com.wansensoft.service.depotHead.DepotHeadService; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.orgaUserRel.OrgaUserRelService; +import com.wansensoft.service.supplier.SupplierService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.StringUtil; +import com.wansensoft.utils.Tools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -31,8 +31,6 @@ import java.util.Date; import java.util.List; -import static com.wansensoft.erp.utils.Tools.getCenternTime; - @Service public class AccountHeadService { private Logger logger = LoggerFactory.getLogger(AccountHeadService.class); @@ -95,7 +93,7 @@ public List select(String type, String roleType, String bi List resList = new ArrayList<>(); try{ String [] creatorArray = getCreatorArray(roleType); - beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); + beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); List list = accountHeadMapperEx.selectByConditionAccountHead(type, creatorArray, billNo, beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, number, offset, rows); @@ -120,7 +118,7 @@ public List select(String type, String roleType, String bi } } if(ah.getBillTime() !=null) { - ah.setBillTimeStr(getCenternTime(ah.getBillTime())); + ah.setBillTimeStr(Tools.getCenternTime(ah.getBillTime())); } resList.add(ah); } @@ -381,7 +379,7 @@ public List getDetailByNumber(String billNo)throws Excepti } } if(ah.getBillTime() !=null) { - ah.setBillTimeStr(getCenternTime(ah.getBillTime())); + ah.setBillTimeStr(Tools.getCenternTime(ah.getBillTime())); } resList.add(ah); } diff --git a/src/main/java/com/wansensoft/erp/service/accountItem/AccountItemComponent.java b/src/main/java/com/wansensoft/service/accountItem/AccountItemComponent.java similarity index 91% rename from src/main/java/com/wansensoft/erp/service/accountItem/AccountItemComponent.java rename to src/main/java/com/wansensoft/service/accountItem/AccountItemComponent.java index d15748a3..a3c9a732 100644 --- a/src/main/java/com/wansensoft/erp/service/accountItem/AccountItemComponent.java +++ b/src/main/java/com/wansensoft/service/accountItem/AccountItemComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.accountItem; +package com.wansensoft.service.accountItem; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/accountItem/AccountItemResource.java b/src/main/java/com/wansensoft/service/accountItem/AccountItemResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/accountItem/AccountItemResource.java rename to src/main/java/com/wansensoft/service/accountItem/AccountItemResource.java index 164b42d7..75b07017 100644 --- a/src/main/java/com/wansensoft/erp/service/accountItem/AccountItemResource.java +++ b/src/main/java/com/wansensoft/service/accountItem/AccountItemResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.accountItem; +package com.wansensoft.service.accountItem; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/accountItem/AccountItemService.java b/src/main/java/com/wansensoft/service/accountItem/AccountItemService.java similarity index 92% rename from src/main/java/com/wansensoft/erp/service/accountItem/AccountItemService.java rename to src/main/java/com/wansensoft/service/accountItem/AccountItemService.java index 2f5bdbf8..70107fa8 100644 --- a/src/main/java/com/wansensoft/erp/service/accountItem/AccountItemService.java +++ b/src/main/java/com/wansensoft/service/accountItem/AccountItemService.java @@ -1,21 +1,21 @@ -package com.wansensoft.erp.service.accountItem; +package com.wansensoft.service.accountItem; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.AccountItem; -import com.wansensoft.erp.datasource.entities.AccountItemExample; -import com.wansensoft.erp.datasource.entities.User; -import com.wansensoft.erp.datasource.mappers.AccountItemMapper; -import com.wansensoft.erp.datasource.mappers.AccountItemMapperEx; -import com.wansensoft.erp.datasource.vo.AccountItemVo4List; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.depotHead.DepotHeadService; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.entities.AccountItem; +import com.wansensoft.datasource.entities.AccountItemExample; +import com.wansensoft.datasource.entities.User; +import com.wansensoft.datasource.mappers.AccountItemMapper; +import com.wansensoft.datasource.mappers.AccountItemMapperEx; +import com.wansensoft.datasource.vo.AccountItemVo4List; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.depotHead.DepotHeadService; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/depot/DepotComponent.java b/src/main/java/com/wansensoft/service/depot/DepotComponent.java similarity index 91% rename from src/main/java/com/wansensoft/erp/service/depot/DepotComponent.java rename to src/main/java/com/wansensoft/service/depot/DepotComponent.java index d807c994..eced3528 100644 --- a/src/main/java/com/wansensoft/erp/service/depot/DepotComponent.java +++ b/src/main/java/com/wansensoft/service/depot/DepotComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.depot; +package com.wansensoft.service.depot; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/depot/DepotResource.java b/src/main/java/com/wansensoft/service/depot/DepotResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/depot/DepotResource.java rename to src/main/java/com/wansensoft/service/depot/DepotResource.java index 5398158c..211c59f6 100644 --- a/src/main/java/com/wansensoft/erp/service/depot/DepotResource.java +++ b/src/main/java/com/wansensoft/service/depot/DepotResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.depot; +package com.wansensoft.service.depot; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/depot/DepotService.java b/src/main/java/com/wansensoft/service/depot/DepotService.java similarity index 94% rename from src/main/java/com/wansensoft/erp/service/depot/DepotService.java rename to src/main/java/com/wansensoft/service/depot/DepotService.java index 7a069e93..1a2debe3 100644 --- a/src/main/java/com/wansensoft/erp/service/depot/DepotService.java +++ b/src/main/java/com/wansensoft/service/depot/DepotService.java @@ -1,21 +1,21 @@ -package com.wansensoft.erp.service.depot; +package com.wansensoft.service.depot; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.*; -import com.wansensoft.erp.datasource.mappers.DepotHeadMapperEx; -import com.wansensoft.erp.datasource.mappers.DepotItemMapperEx; -import com.wansensoft.erp.datasource.mappers.DepotMapper; -import com.wansensoft.erp.datasource.mappers.DepotMapperEx; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.systemConfig.SystemConfigService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.service.userBusiness.UserBusinessService; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.entities.*; +import com.wansensoft.datasource.mappers.DepotHeadMapperEx; +import com.wansensoft.datasource.mappers.DepotItemMapperEx; +import com.wansensoft.datasource.mappers.DepotMapper; +import com.wansensoft.datasource.mappers.DepotMapperEx; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.systemConfig.SystemConfigService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.service.userBusiness.UserBusinessService; +import com.wansensoft.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/depotHead/DepotHeadComponent.java b/src/main/java/com/wansensoft/service/depotHead/DepotHeadComponent.java similarity index 95% rename from src/main/java/com/wansensoft/erp/service/depotHead/DepotHeadComponent.java rename to src/main/java/com/wansensoft/service/depotHead/DepotHeadComponent.java index 42fed270..02d9d724 100644 --- a/src/main/java/com/wansensoft/erp/service/depotHead/DepotHeadComponent.java +++ b/src/main/java/com/wansensoft/service/depotHead/DepotHeadComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.depotHead; +package com.wansensoft.service.depotHead; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/depotHead/DepotHeadResource.java b/src/main/java/com/wansensoft/service/depotHead/DepotHeadResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/depotHead/DepotHeadResource.java rename to src/main/java/com/wansensoft/service/depotHead/DepotHeadResource.java index 5c76da96..a5d70909 100644 --- a/src/main/java/com/wansensoft/erp/service/depotHead/DepotHeadResource.java +++ b/src/main/java/com/wansensoft/service/depotHead/DepotHeadResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.depotHead; +package com.wansensoft.service.depotHead; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/wansensoft/service/depotHead/DepotHeadService.java similarity index 95% rename from src/main/java/com/wansensoft/erp/service/depotHead/DepotHeadService.java rename to src/main/java/com/wansensoft/service/depotHead/DepotHeadService.java index 3964b16a..cc218233 100644 --- a/src/main/java/com/wansensoft/erp/service/depotHead/DepotHeadService.java +++ b/src/main/java/com/wansensoft/service/depotHead/DepotHeadService.java @@ -1,31 +1,31 @@ -package com.wansensoft.erp.service.depotHead; +package com.wansensoft.service.depotHead; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.*; -import com.wansensoft.erp.datasource.mappers.DepotHeadMapper; -import com.wansensoft.erp.datasource.mappers.DepotHeadMapperEx; -import com.wansensoft.erp.datasource.mappers.DepotItemMapperEx; -import com.wansensoft.erp.datasource.vo.*; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.account.AccountService; -import com.wansensoft.erp.service.accountHead.AccountHeadService; -import com.wansensoft.erp.service.accountItem.AccountItemService; -import com.wansensoft.erp.service.depot.DepotService; -import com.wansensoft.erp.service.depotItem.DepotItemService; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.orgaUserRel.OrgaUserRelService; -import com.wansensoft.erp.service.person.PersonService; -import com.wansensoft.erp.service.role.RoleService; -import com.wansensoft.erp.service.serialNumber.SerialNumberService; -import com.wansensoft.erp.service.supplier.SupplierService; -import com.wansensoft.erp.service.systemConfig.SystemConfigService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.service.userBusiness.UserBusinessService; -import com.wansensoft.erp.utils.StringUtil; -import com.wansensoft.erp.utils.Tools; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.entities.*; +import com.wansensoft.datasource.mappers.DepotHeadMapper; +import com.wansensoft.datasource.mappers.DepotHeadMapperEx; +import com.wansensoft.datasource.mappers.DepotItemMapperEx; +import com.wansensoft.datasource.vo.*; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.account.AccountService; +import com.wansensoft.service.accountHead.AccountHeadService; +import com.wansensoft.service.accountItem.AccountItemService; +import com.wansensoft.service.depot.DepotService; +import com.wansensoft.service.depotItem.DepotItemService; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.orgaUserRel.OrgaUserRelService; +import com.wansensoft.service.person.PersonService; +import com.wansensoft.service.role.RoleService; +import com.wansensoft.service.serialNumber.SerialNumberService; +import com.wansensoft.service.supplier.SupplierService; +import com.wansensoft.service.systemConfig.SystemConfigService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.service.userBusiness.UserBusinessService; +import com.wansensoft.utils.StringUtil; +import com.wansensoft.utils.Tools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -39,9 +39,6 @@ import java.sql.Timestamp; import java.util.*; -import static com.wansensoft.erp.utils.Tools.getCenternTime; -import static com.wansensoft.erp.utils.Tools.getNow3; - @Service public class DepotHeadService { private Logger logger = LoggerFactory.getLogger(DepotHeadService.class); @@ -104,7 +101,7 @@ public List getDepotHead()throws Exception { } public List select(String type, String subType, String roleType, String hasDebt, String status, String purchaseStatus, String number, String linkNumber, - String beginTime, String endTime, String materialParam, Long organId, Long creator, Long depotId, Long accountId, String remark, int offset, int rows) throws Exception { + String beginTime, String endTime, String materialParam, Long organId, Long creator, Long depotId, Long accountId, String remark, int offset, int rows) throws Exception { List resList = new ArrayList<>(); try{ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); @@ -190,7 +187,7 @@ public List select(String type, String subType, String roleTyp dh.setSalesManStr(personService.getPersonByMapAndIds(personMap,dh.getSalesMan())); } if(dh.getOperTime() != null) { - dh.setOperTimeStr(getCenternTime(dh.getOperTime())); + dh.setOperTimeStr(Tools.getCenternTime(dh.getOperTime())); } //商品信息简述 if(materialsListMap!=null) { @@ -822,7 +819,7 @@ public List getDetailByNumber(String number, HttpServletReques dh.setSalesManStr(personService.getPersonByMapAndIds(personMap,dh.getSalesMan())); } if(dh.getOperTime() != null) { - dh.setOperTimeStr(getCenternTime(dh.getOperTime())); + dh.setOperTimeStr(Tools.getCenternTime(dh.getOperTime())); } //商品信息简述 if(materialsListMap!=null) { @@ -1125,30 +1122,30 @@ public Map getBuyAndSaleStatistics(String today, String monthFir Map map = new HashMap<>(); //今日 BigDecimal todayBuy = getBuyAndSaleBasicStatistics("入库", "采购", - 1, today, getNow3(), creatorArray); //今日采购入库 + 1, today, Tools.getNow3(), creatorArray); //今日采购入库 BigDecimal todayBuyBack = getBuyAndSaleBasicStatistics("出库", "采购退货", - 1, today, getNow3(), creatorArray); //今日采购退货 + 1, today, Tools.getNow3(), creatorArray); //今日采购退货 BigDecimal todaySale = getBuyAndSaleBasicStatistics("出库", "销售", - 1, today, getNow3(), creatorArray); //今日销售出库 + 1, today, Tools.getNow3(), creatorArray); //今日销售出库 BigDecimal todaySaleBack = getBuyAndSaleBasicStatistics("入库", "销售退货", - 1, today, getNow3(), creatorArray); //今日销售退货 + 1, today, Tools.getNow3(), creatorArray); //今日销售退货 BigDecimal todayRetailSale = getBuyAndSaleRetailStatistics("出库", "零售", - today, getNow3(), creatorArray); //今日零售出库 + today, Tools.getNow3(), creatorArray); //今日零售出库 BigDecimal todayRetailSaleBack = getBuyAndSaleRetailStatistics("入库", "零售退货", - today, getNow3(), creatorArray); //今日零售退货 + today, Tools.getNow3(), creatorArray); //今日零售退货 //本月 BigDecimal monthBuy = getBuyAndSaleBasicStatistics("入库", "采购", - 1, monthFirstDay, getNow3(), creatorArray); //本月采购入库 + 1, monthFirstDay, Tools.getNow3(), creatorArray); //本月采购入库 BigDecimal monthBuyBack = getBuyAndSaleBasicStatistics("出库", "采购退货", - 1, monthFirstDay, getNow3(), creatorArray); //本月采购退货 + 1, monthFirstDay, Tools.getNow3(), creatorArray); //本月采购退货 BigDecimal monthSale = getBuyAndSaleBasicStatistics("出库", "销售", - 1,monthFirstDay, getNow3(), creatorArray); //本月销售出库 + 1,monthFirstDay, Tools.getNow3(), creatorArray); //本月销售出库 BigDecimal monthSaleBack = getBuyAndSaleBasicStatistics("入库", "销售退货", - 1,monthFirstDay, getNow3(), creatorArray); //本月销售退货 + 1,monthFirstDay, Tools.getNow3(), creatorArray); //本月销售退货 BigDecimal monthRetailSale = getBuyAndSaleRetailStatistics("出库", "零售", - monthFirstDay, getNow3(), creatorArray); //本月零售出库 + monthFirstDay, Tools.getNow3(), creatorArray); //本月零售出库 BigDecimal monthRetailSaleBack = getBuyAndSaleRetailStatistics("入库", "零售退货", - monthFirstDay, getNow3(), creatorArray); //本月零售退货 + monthFirstDay, Tools.getNow3(), creatorArray); //本月零售退货 //昨日 BigDecimal yesterdayBuy = getBuyAndSaleBasicStatistics("入库", "采购", 1, yesterdayBegin, yesterdayEnd, creatorArray); //昨日采购入库 @@ -1246,7 +1243,7 @@ public List debtList(Long organId, String materialParam, Strin dh.setDeposit(BigDecimal.ZERO); } if(dh.getOperTime() != null) { - dh.setOperTimeStr(getCenternTime(dh.getOperTime())); + dh.setOperTimeStr(Tools.getCenternTime(dh.getOperTime())); } BigDecimal discountLastMoney = dh.getDiscountLastMoney()!=null?dh.getDiscountLastMoney():BigDecimal.ZERO; BigDecimal otherMoney = dh.getOtherMoney()!=null?dh.getOtherMoney():BigDecimal.ZERO; diff --git a/src/main/java/com/wansensoft/erp/service/depotItem/DepotItemComponent.java b/src/main/java/com/wansensoft/service/depotItem/DepotItemComponent.java similarity index 91% rename from src/main/java/com/wansensoft/erp/service/depotItem/DepotItemComponent.java rename to src/main/java/com/wansensoft/service/depotItem/DepotItemComponent.java index 6d66e4e0..35a77e8a 100644 --- a/src/main/java/com/wansensoft/erp/service/depotItem/DepotItemComponent.java +++ b/src/main/java/com/wansensoft/service/depotItem/DepotItemComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.depotItem; +package com.wansensoft.service.depotItem; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/depotItem/DepotItemResource.java b/src/main/java/com/wansensoft/service/depotItem/DepotItemResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/depotItem/DepotItemResource.java rename to src/main/java/com/wansensoft/service/depotItem/DepotItemResource.java index 62a9d385..27cc1044 100644 --- a/src/main/java/com/wansensoft/erp/service/depotItem/DepotItemResource.java +++ b/src/main/java/com/wansensoft/service/depotItem/DepotItemResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.depotItem; +package com.wansensoft.service.depotItem; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/depotItem/DepotItemService.java b/src/main/java/com/wansensoft/service/depotItem/DepotItemService.java similarity index 98% rename from src/main/java/com/wansensoft/erp/service/depotItem/DepotItemService.java rename to src/main/java/com/wansensoft/service/depotItem/DepotItemService.java index 62210b4d..6d5fc534 100644 --- a/src/main/java/com/wansensoft/erp/service/depotItem/DepotItemService.java +++ b/src/main/java/com/wansensoft/service/depotItem/DepotItemService.java @@ -1,27 +1,27 @@ -package com.wansensoft.erp.service.depotItem; +package com.wansensoft.service.depotItem; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.*; -import com.wansensoft.erp.datasource.mappers.*; -import com.wansensoft.erp.datasource.vo.DepotItemStockWarningCount; -import com.wansensoft.erp.datasource.vo.DepotItemVo4Stock; -import com.wansensoft.erp.datasource.vo.DepotItemVoBatchNumberList; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.depot.DepotService; -import com.wansensoft.erp.service.depotHead.DepotHeadService; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.material.MaterialService; -import com.wansensoft.erp.service.materialExtend.MaterialExtendService; -import com.wansensoft.erp.service.serialNumber.SerialNumberService; -import com.wansensoft.erp.service.systemConfig.SystemConfigService; -import com.wansensoft.erp.service.unit.UnitService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; -import com.wansensoft.erp.utils.Tools; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.entities.*; +import com.wansensoft.datasource.mappers.*; +import com.wansensoft.datasource.vo.DepotItemStockWarningCount; +import com.wansensoft.datasource.vo.DepotItemVo4Stock; +import com.wansensoft.datasource.vo.DepotItemVoBatchNumberList; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.depot.DepotService; +import com.wansensoft.service.depotHead.DepotHeadService; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.material.MaterialService; +import com.wansensoft.service.materialExtend.MaterialExtendService; +import com.wansensoft.service.serialNumber.SerialNumberService; +import com.wansensoft.service.systemConfig.SystemConfigService; +import com.wansensoft.service.unit.UnitService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.StringUtil; +import com.wansensoft.utils.Tools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/functions/FunctionComponent.java b/src/main/java/com/wansensoft/service/functions/FunctionComponent.java similarity index 90% rename from src/main/java/com/wansensoft/erp/service/functions/FunctionComponent.java rename to src/main/java/com/wansensoft/service/functions/FunctionComponent.java index e8727762..6a3bea05 100644 --- a/src/main/java/com/wansensoft/erp/service/functions/FunctionComponent.java +++ b/src/main/java/com/wansensoft/service/functions/FunctionComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.functions; +package com.wansensoft.service.functions; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/functions/FunctionResource.java b/src/main/java/com/wansensoft/service/functions/FunctionResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/functions/FunctionResource.java rename to src/main/java/com/wansensoft/service/functions/FunctionResource.java index 177b078a..2b906fac 100644 --- a/src/main/java/com/wansensoft/erp/service/functions/FunctionResource.java +++ b/src/main/java/com/wansensoft/service/functions/FunctionResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.functions; +package com.wansensoft.service.functions; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/functions/FunctionService.java b/src/main/java/com/wansensoft/service/functions/FunctionService.java similarity index 92% rename from src/main/java/com/wansensoft/erp/service/functions/FunctionService.java rename to src/main/java/com/wansensoft/service/functions/FunctionService.java index c8ea14e1..167d9935 100644 --- a/src/main/java/com/wansensoft/erp/service/functions/FunctionService.java +++ b/src/main/java/com/wansensoft/service/functions/FunctionService.java @@ -1,18 +1,18 @@ -package com.wansensoft.erp.service.functions; +package com.wansensoft.service.functions; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.datasource.entities.Function; -import com.wansensoft.erp.datasource.entities.FunctionEx; -import com.wansensoft.erp.datasource.entities.FunctionExample; -import com.wansensoft.erp.datasource.entities.User; -import com.wansensoft.erp.datasource.mappers.FunctionMapper; -import com.wansensoft.erp.datasource.mappers.FunctionMapperEx; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.systemConfig.SystemConfigService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.datasource.entities.Function; +import com.wansensoft.datasource.entities.FunctionEx; +import com.wansensoft.datasource.entities.FunctionExample; +import com.wansensoft.datasource.entities.User; +import com.wansensoft.datasource.mappers.FunctionMapper; +import com.wansensoft.datasource.mappers.FunctionMapperEx; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.systemConfig.SystemConfigService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/inOutItem/InOutItemComponent.java b/src/main/java/com/wansensoft/service/inOutItem/InOutItemComponent.java similarity index 91% rename from src/main/java/com/wansensoft/erp/service/inOutItem/InOutItemComponent.java rename to src/main/java/com/wansensoft/service/inOutItem/InOutItemComponent.java index dfe97619..219b9004 100644 --- a/src/main/java/com/wansensoft/erp/service/inOutItem/InOutItemComponent.java +++ b/src/main/java/com/wansensoft/service/inOutItem/InOutItemComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.inOutItem; +package com.wansensoft.service.inOutItem; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/inOutItem/InOutItemResource.java b/src/main/java/com/wansensoft/service/inOutItem/InOutItemResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/inOutItem/InOutItemResource.java rename to src/main/java/com/wansensoft/service/inOutItem/InOutItemResource.java index 29f9dd28..5920a5fa 100644 --- a/src/main/java/com/wansensoft/erp/service/inOutItem/InOutItemResource.java +++ b/src/main/java/com/wansensoft/service/inOutItem/InOutItemResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.inOutItem; +package com.wansensoft.service.inOutItem; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/inOutItem/InOutItemService.java b/src/main/java/com/wansensoft/service/inOutItem/InOutItemService.java similarity index 91% rename from src/main/java/com/wansensoft/erp/service/inOutItem/InOutItemService.java rename to src/main/java/com/wansensoft/service/inOutItem/InOutItemService.java index 180599c6..67a368ef 100644 --- a/src/main/java/com/wansensoft/erp/service/inOutItem/InOutItemService.java +++ b/src/main/java/com/wansensoft/service/inOutItem/InOutItemService.java @@ -1,20 +1,20 @@ -package com.wansensoft.erp.service.inOutItem; +package com.wansensoft.service.inOutItem; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.AccountItem; -import com.wansensoft.erp.datasource.entities.InOutItem; -import com.wansensoft.erp.datasource.entities.InOutItemExample; -import com.wansensoft.erp.datasource.entities.User; -import com.wansensoft.erp.datasource.mappers.AccountItemMapperEx; -import com.wansensoft.erp.datasource.mappers.InOutItemMapper; -import com.wansensoft.erp.datasource.mappers.InOutItemMapperEx; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.entities.AccountItem; +import com.wansensoft.datasource.entities.InOutItem; +import com.wansensoft.datasource.entities.InOutItemExample; +import com.wansensoft.datasource.entities.User; +import com.wansensoft.datasource.mappers.AccountItemMapperEx; +import com.wansensoft.datasource.mappers.InOutItemMapper; +import com.wansensoft.datasource.mappers.InOutItemMapperEx; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/log/LogComponent.java b/src/main/java/com/wansensoft/service/log/LogComponent.java similarity index 92% rename from src/main/java/com/wansensoft/erp/service/log/LogComponent.java rename to src/main/java/com/wansensoft/service/log/LogComponent.java index 1223e4b1..f5bcc245 100644 --- a/src/main/java/com/wansensoft/erp/service/log/LogComponent.java +++ b/src/main/java/com/wansensoft/service/log/LogComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.log; +package com.wansensoft.service.log; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/log/LogResource.java b/src/main/java/com/wansensoft/service/log/LogResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/log/LogResource.java rename to src/main/java/com/wansensoft/service/log/LogResource.java index 9ce0e43b..0287dfa8 100644 --- a/src/main/java/com/wansensoft/erp/service/log/LogResource.java +++ b/src/main/java/com/wansensoft/service/log/LogResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.log; +package com.wansensoft.service.log; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/log/LogService.java b/src/main/java/com/wansensoft/service/log/LogService.java similarity index 90% rename from src/main/java/com/wansensoft/erp/service/log/LogService.java rename to src/main/java/com/wansensoft/service/log/LogService.java index 631a6c35..3d91c518 100644 --- a/src/main/java/com/wansensoft/erp/service/log/LogService.java +++ b/src/main/java/com/wansensoft/service/log/LogService.java @@ -1,17 +1,17 @@ -package com.wansensoft.erp.service.log; +package com.wansensoft.service.log; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.datasource.entities.Log; -import com.wansensoft.erp.datasource.entities.LogExample; -import com.wansensoft.erp.datasource.mappers.LogMapper; -import com.wansensoft.erp.datasource.mappers.LogMapperEx; -import com.wansensoft.erp.datasource.vo.LogVo4List; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.redis.RedisService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; -import com.wansensoft.erp.utils.Tools; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.datasource.entities.Log; +import com.wansensoft.datasource.entities.LogExample; +import com.wansensoft.datasource.mappers.LogMapper; +import com.wansensoft.datasource.mappers.LogMapperEx; +import com.wansensoft.datasource.vo.LogVo4List; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.redis.RedisService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.StringUtil; +import com.wansensoft.utils.Tools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -22,7 +22,7 @@ import java.util.Date; import java.util.List; -import static com.wansensoft.erp.utils.Tools.getLocalIp; +import static com.wansensoft.utils.Tools.getLocalIp; @Service public class LogService { diff --git a/src/main/java/com/wansensoft/erp/service/material/MaterialComponent.java b/src/main/java/com/wansensoft/service/material/MaterialComponent.java similarity index 94% rename from src/main/java/com/wansensoft/erp/service/material/MaterialComponent.java rename to src/main/java/com/wansensoft/service/material/MaterialComponent.java index 25a4fdf8..b187243e 100644 --- a/src/main/java/com/wansensoft/erp/service/material/MaterialComponent.java +++ b/src/main/java/com/wansensoft/service/material/MaterialComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.material; +package com.wansensoft.service.material; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/material/MaterialResource.java b/src/main/java/com/wansensoft/service/material/MaterialResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/material/MaterialResource.java rename to src/main/java/com/wansensoft/service/material/MaterialResource.java index afeb30ba..d3b92537 100644 --- a/src/main/java/com/wansensoft/erp/service/material/MaterialResource.java +++ b/src/main/java/com/wansensoft/service/material/MaterialResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.material; +package com.wansensoft.service.material; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/material/MaterialService.java b/src/main/java/com/wansensoft/service/material/MaterialService.java similarity index 98% rename from src/main/java/com/wansensoft/erp/service/material/MaterialService.java rename to src/main/java/com/wansensoft/service/material/MaterialService.java index e530a649..9e98effb 100644 --- a/src/main/java/com/wansensoft/erp/service/material/MaterialService.java +++ b/src/main/java/com/wansensoft/service/material/MaterialService.java @@ -1,25 +1,25 @@ -package com.wansensoft.erp.service.material; +package com.wansensoft.service.material; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.*; -import com.wansensoft.erp.datasource.mappers.*; -import com.wansensoft.erp.datasource.vo.MaterialVoSearch; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.depot.DepotService; -import com.wansensoft.erp.service.depotItem.DepotItemService; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.materialCategory.MaterialCategoryService; -import com.wansensoft.erp.service.materialExtend.MaterialExtendService; -import com.wansensoft.erp.service.unit.UnitService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.BaseResponseInfo; -import com.wansensoft.erp.utils.ExcelUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.entities.*; +import com.wansensoft.datasource.mappers.*; +import com.wansensoft.datasource.vo.MaterialVoSearch; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.depot.DepotService; +import com.wansensoft.service.depotItem.DepotItemService; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.materialCategory.MaterialCategoryService; +import com.wansensoft.service.materialExtend.MaterialExtendService; +import com.wansensoft.service.unit.UnitService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.BaseResponseInfo; +import com.wansensoft.utils.ExcelUtils; +import com.wansensoft.utils.StringUtil; import jxl.Sheet; import jxl.Workbook; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/service/materialAttribute/MaterialAttributeComponent.java b/src/main/java/com/wansensoft/service/materialAttribute/MaterialAttributeComponent.java similarity index 90% rename from src/main/java/com/wansensoft/erp/service/materialAttribute/MaterialAttributeComponent.java rename to src/main/java/com/wansensoft/service/materialAttribute/MaterialAttributeComponent.java index da776f03..3307f5ee 100644 --- a/src/main/java/com/wansensoft/erp/service/materialAttribute/MaterialAttributeComponent.java +++ b/src/main/java/com/wansensoft/service/materialAttribute/MaterialAttributeComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.materialAttribute; +package com.wansensoft.service.materialAttribute; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/materialAttribute/MaterialAttributeResource.java b/src/main/java/com/wansensoft/service/materialAttribute/MaterialAttributeResource.java similarity index 71% rename from src/main/java/com/wansensoft/erp/service/materialAttribute/MaterialAttributeResource.java rename to src/main/java/com/wansensoft/service/materialAttribute/MaterialAttributeResource.java index 434415ec..04ce345b 100644 --- a/src/main/java/com/wansensoft/erp/service/materialAttribute/MaterialAttributeResource.java +++ b/src/main/java/com/wansensoft/service/materialAttribute/MaterialAttributeResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.materialAttribute; +package com.wansensoft.service.materialAttribute; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/materialAttribute/MaterialAttributeService.java b/src/main/java/com/wansensoft/service/materialAttribute/MaterialAttributeService.java similarity index 91% rename from src/main/java/com/wansensoft/erp/service/materialAttribute/MaterialAttributeService.java rename to src/main/java/com/wansensoft/service/materialAttribute/MaterialAttributeService.java index c2113dbb..f7d12c72 100644 --- a/src/main/java/com/wansensoft/erp/service/materialAttribute/MaterialAttributeService.java +++ b/src/main/java/com/wansensoft/service/materialAttribute/MaterialAttributeService.java @@ -1,16 +1,16 @@ -package com.wansensoft.erp.service.materialAttribute; +package com.wansensoft.service.materialAttribute; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.datasource.entities.MaterialAttribute; -import com.wansensoft.erp.datasource.entities.MaterialAttributeExample; -import com.wansensoft.erp.datasource.mappers.MaterialAttributeMapper; -import com.wansensoft.erp.datasource.mappers.MaterialAttributeMapperEx; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.datasource.entities.MaterialAttribute; +import com.wansensoft.datasource.entities.MaterialAttributeExample; +import com.wansensoft.datasource.mappers.MaterialAttributeMapper; +import com.wansensoft.datasource.mappers.MaterialAttributeMapperEx; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.log.LogService; +import com.wansensoft.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/materialCategory/MaterialCategoryComponent.java b/src/main/java/com/wansensoft/service/materialCategory/MaterialCategoryComponent.java similarity index 91% rename from src/main/java/com/wansensoft/erp/service/materialCategory/MaterialCategoryComponent.java rename to src/main/java/com/wansensoft/service/materialCategory/MaterialCategoryComponent.java index b7215938..a30a4811 100644 --- a/src/main/java/com/wansensoft/erp/service/materialCategory/MaterialCategoryComponent.java +++ b/src/main/java/com/wansensoft/service/materialCategory/MaterialCategoryComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.materialCategory; +package com.wansensoft.service.materialCategory; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/materialCategory/MaterialCategoryResource.java b/src/main/java/com/wansensoft/service/materialCategory/MaterialCategoryResource.java similarity index 71% rename from src/main/java/com/wansensoft/erp/service/materialCategory/MaterialCategoryResource.java rename to src/main/java/com/wansensoft/service/materialCategory/MaterialCategoryResource.java index d6a82bd5..e017ceec 100644 --- a/src/main/java/com/wansensoft/erp/service/materialCategory/MaterialCategoryResource.java +++ b/src/main/java/com/wansensoft/service/materialCategory/MaterialCategoryResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.materialCategory; +package com.wansensoft.service.materialCategory; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/materialCategory/MaterialCategoryService.java b/src/main/java/com/wansensoft/service/materialCategory/MaterialCategoryService.java similarity index 94% rename from src/main/java/com/wansensoft/erp/service/materialCategory/MaterialCategoryService.java rename to src/main/java/com/wansensoft/service/materialCategory/MaterialCategoryService.java index 4e76a7f5..dc45a05f 100644 --- a/src/main/java/com/wansensoft/erp/service/materialCategory/MaterialCategoryService.java +++ b/src/main/java/com/wansensoft/service/materialCategory/MaterialCategoryService.java @@ -1,18 +1,21 @@ -package com.wansensoft.erp.service.materialCategory; +package com.wansensoft.service.materialCategory; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.*; -import com.wansensoft.erp.datasource.mappers.MaterialCategoryMapper; -import com.wansensoft.erp.datasource.mappers.MaterialCategoryMapperEx; -import com.wansensoft.erp.datasource.mappers.MaterialMapperEx; -import com.wansensoft.erp.datasource.vo.TreeNode; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.entities.Material; +import com.wansensoft.datasource.entities.MaterialCategory; +import com.wansensoft.datasource.entities.MaterialCategoryExample; +import com.wansensoft.datasource.entities.User; +import com.wansensoft.datasource.mappers.MaterialCategoryMapper; +import com.wansensoft.datasource.mappers.MaterialCategoryMapperEx; +import com.wansensoft.datasource.mappers.MaterialMapperEx; +import com.wansensoft.datasource.vo.TreeNode; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/materialExtend/MaterialExtendComponent.java b/src/main/java/com/wansensoft/service/materialExtend/MaterialExtendComponent.java similarity index 94% rename from src/main/java/com/wansensoft/erp/service/materialExtend/MaterialExtendComponent.java rename to src/main/java/com/wansensoft/service/materialExtend/MaterialExtendComponent.java index 10924d84..2ec48470 100644 --- a/src/main/java/com/wansensoft/erp/service/materialExtend/MaterialExtendComponent.java +++ b/src/main/java/com/wansensoft/service/materialExtend/MaterialExtendComponent.java @@ -1,7 +1,7 @@ -package com.wansensoft.erp.service.materialExtend; +package com.wansensoft.service.materialExtend; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; +import com.wansensoft.service.ICommonQuery; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/materialExtend/MaterialExtendResource.java b/src/main/java/com/wansensoft/service/materialExtend/MaterialExtendResource.java similarity index 71% rename from src/main/java/com/wansensoft/erp/service/materialExtend/MaterialExtendResource.java rename to src/main/java/com/wansensoft/service/materialExtend/MaterialExtendResource.java index 7bc92206..1146743a 100644 --- a/src/main/java/com/wansensoft/erp/service/materialExtend/MaterialExtendResource.java +++ b/src/main/java/com/wansensoft/service/materialExtend/MaterialExtendResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.materialExtend; +package com.wansensoft.service.materialExtend; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/materialExtend/MaterialExtendService.java b/src/main/java/com/wansensoft/service/materialExtend/MaterialExtendService.java similarity index 95% rename from src/main/java/com/wansensoft/erp/service/materialExtend/MaterialExtendService.java rename to src/main/java/com/wansensoft/service/materialExtend/MaterialExtendService.java index 3c1b9995..5715c03f 100644 --- a/src/main/java/com/wansensoft/erp/service/materialExtend/MaterialExtendService.java +++ b/src/main/java/com/wansensoft/service/materialExtend/MaterialExtendService.java @@ -1,22 +1,22 @@ -package com.wansensoft.erp.service.materialExtend; +package com.wansensoft.service.materialExtend; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.MaterialExtend; -import com.wansensoft.erp.datasource.entities.MaterialExtendExample; -import com.wansensoft.erp.datasource.entities.User; -import com.wansensoft.erp.datasource.mappers.MaterialExtendMapper; -import com.wansensoft.erp.datasource.mappers.MaterialExtendMapperEx; -import com.wansensoft.erp.datasource.vo.MaterialExtendVo4List; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.redis.RedisService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.entities.MaterialExtend; +import com.wansensoft.datasource.entities.MaterialExtendExample; +import com.wansensoft.datasource.entities.User; +import com.wansensoft.datasource.mappers.MaterialExtendMapper; +import com.wansensoft.datasource.mappers.MaterialExtendMapperEx; +import com.wansensoft.datasource.vo.MaterialExtendVo4List; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.redis.RedisService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/materialProperty/MaterialPropertyComponent.java b/src/main/java/com/wansensoft/service/materialProperty/MaterialPropertyComponent.java similarity index 90% rename from src/main/java/com/wansensoft/erp/service/materialProperty/MaterialPropertyComponent.java rename to src/main/java/com/wansensoft/service/materialProperty/MaterialPropertyComponent.java index cec10c7c..55ac611a 100644 --- a/src/main/java/com/wansensoft/erp/service/materialProperty/MaterialPropertyComponent.java +++ b/src/main/java/com/wansensoft/service/materialProperty/MaterialPropertyComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.materialProperty; +package com.wansensoft.service.materialProperty; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/materialProperty/MaterialPropertyResource.java b/src/main/java/com/wansensoft/service/materialProperty/MaterialPropertyResource.java similarity index 71% rename from src/main/java/com/wansensoft/erp/service/materialProperty/MaterialPropertyResource.java rename to src/main/java/com/wansensoft/service/materialProperty/MaterialPropertyResource.java index 0a979ec3..574b7d9a 100644 --- a/src/main/java/com/wansensoft/erp/service/materialProperty/MaterialPropertyResource.java +++ b/src/main/java/com/wansensoft/service/materialProperty/MaterialPropertyResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.materialProperty; +package com.wansensoft.service.materialProperty; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/materialProperty/MaterialPropertyService.java b/src/main/java/com/wansensoft/service/materialProperty/MaterialPropertyService.java similarity index 90% rename from src/main/java/com/wansensoft/erp/service/materialProperty/MaterialPropertyService.java rename to src/main/java/com/wansensoft/service/materialProperty/MaterialPropertyService.java index b64135a6..1df28931 100644 --- a/src/main/java/com/wansensoft/erp/service/materialProperty/MaterialPropertyService.java +++ b/src/main/java/com/wansensoft/service/materialProperty/MaterialPropertyService.java @@ -1,15 +1,15 @@ -package com.wansensoft.erp.service.materialProperty; +package com.wansensoft.service.materialProperty; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.datasource.entities.MaterialProperty; -import com.wansensoft.erp.datasource.entities.MaterialPropertyExample; -import com.wansensoft.erp.datasource.entities.User; -import com.wansensoft.erp.datasource.mappers.MaterialPropertyMapper; -import com.wansensoft.erp.datasource.mappers.MaterialPropertyMapperEx; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.user.UserService; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.datasource.entities.MaterialProperty; +import com.wansensoft.datasource.entities.MaterialPropertyExample; +import com.wansensoft.datasource.entities.User; +import com.wansensoft.datasource.mappers.MaterialPropertyMapper; +import com.wansensoft.datasource.mappers.MaterialPropertyMapperEx; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.user.UserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/msg/MsgComponent.java b/src/main/java/com/wansensoft/service/msg/MsgComponent.java similarity index 90% rename from src/main/java/com/wansensoft/erp/service/msg/MsgComponent.java rename to src/main/java/com/wansensoft/service/msg/MsgComponent.java index 4ba06eca..c8a3709a 100644 --- a/src/main/java/com/wansensoft/erp/service/msg/MsgComponent.java +++ b/src/main/java/com/wansensoft/service/msg/MsgComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.msg; +package com.wansensoft.service.msg; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/msg/MsgResource.java b/src/main/java/com/wansensoft/service/msg/MsgResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/msg/MsgResource.java rename to src/main/java/com/wansensoft/service/msg/MsgResource.java index 2f580a2c..4842810b 100644 --- a/src/main/java/com/wansensoft/erp/service/msg/MsgResource.java +++ b/src/main/java/com/wansensoft/service/msg/MsgResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.msg; +package com.wansensoft.service.msg; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/msg/MsgService.java b/src/main/java/com/wansensoft/service/msg/MsgService.java similarity index 94% rename from src/main/java/com/wansensoft/erp/service/msg/MsgService.java rename to src/main/java/com/wansensoft/service/msg/MsgService.java index 2380fd63..ef7ee00a 100644 --- a/src/main/java/com/wansensoft/erp/service/msg/MsgService.java +++ b/src/main/java/com/wansensoft/service/msg/MsgService.java @@ -1,20 +1,20 @@ -package com.wansensoft.erp.service.msg; +package com.wansensoft.service.msg; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.Msg; -import com.wansensoft.erp.datasource.entities.MsgEx; -import com.wansensoft.erp.datasource.entities.MsgExample; -import com.wansensoft.erp.datasource.entities.User; -import com.wansensoft.erp.datasource.mappers.MsgMapper; -import com.wansensoft.erp.datasource.mappers.MsgMapperEx; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.service.depotHead.DepotHeadService; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; -import com.wansensoft.erp.utils.Tools; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.entities.Msg; +import com.wansensoft.datasource.entities.MsgEx; +import com.wansensoft.datasource.entities.MsgExample; +import com.wansensoft.datasource.entities.User; +import com.wansensoft.datasource.mappers.MsgMapper; +import com.wansensoft.datasource.mappers.MsgMapperEx; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.service.depotHead.DepotHeadService; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.StringUtil; +import com.wansensoft.utils.Tools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -28,7 +28,7 @@ import java.util.Date; import java.util.List; -import static com.wansensoft.erp.utils.Tools.getCenternTime; +import static com.wansensoft.utils.Tools.getCenternTime; @Service public class MsgService { diff --git a/src/main/java/com/wansensoft/erp/service/orgaUserRel/OrgaUserRelComponent.java b/src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelComponent.java similarity index 94% rename from src/main/java/com/wansensoft/erp/service/orgaUserRel/OrgaUserRelComponent.java rename to src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelComponent.java index 58bf007b..7215a7a3 100644 --- a/src/main/java/com/wansensoft/erp/service/orgaUserRel/OrgaUserRelComponent.java +++ b/src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelComponent.java @@ -1,7 +1,7 @@ -package com.wansensoft.erp.service.orgaUserRel; +package com.wansensoft.service.orgaUserRel; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; +import com.wansensoft.service.ICommonQuery; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/orgaUserRel/OrgaUserRelResource.java b/src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelResource.java similarity index 74% rename from src/main/java/com/wansensoft/erp/service/orgaUserRel/OrgaUserRelResource.java rename to src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelResource.java index 94001fd0..59968059 100644 --- a/src/main/java/com/wansensoft/erp/service/orgaUserRel/OrgaUserRelResource.java +++ b/src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.orgaUserRel; +package com.wansensoft.service.orgaUserRel; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/orgaUserRel/OrgaUserRelService.java b/src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelService.java similarity index 91% rename from src/main/java/com/wansensoft/erp/service/orgaUserRel/OrgaUserRelService.java rename to src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelService.java index d1460a8d..28faa99f 100644 --- a/src/main/java/com/wansensoft/erp/service/orgaUserRel/OrgaUserRelService.java +++ b/src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelService.java @@ -1,19 +1,17 @@ -package com.wansensoft.erp.service.orgaUserRel; +package com.wansensoft.service.orgaUserRel; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.datasource.entities.OrgaUserRel; -import com.wansensoft.erp.datasource.entities.OrgaUserRelExample; -import com.wansensoft.erp.datasource.entities.User; -import com.wansensoft.erp.datasource.mappers.OrgaUserRelMapper; -import com.wansensoft.erp.datasource.mappers.OrgaUserRelMapperEx; -import com.wansensoft.erp.datasource.mappers.UserMapper; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.organization.OrganizationService; -import com.wansensoft.erp.service.redis.RedisService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.datasource.entities.OrgaUserRel; +import com.wansensoft.datasource.entities.OrgaUserRelExample; +import com.wansensoft.datasource.entities.User; +import com.wansensoft.datasource.mappers.OrgaUserRelMapper; +import com.wansensoft.datasource.mappers.OrgaUserRelMapperEx; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.organization.OrganizationService; +import com.wansensoft.service.redis.RedisService; +import com.wansensoft.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/organization/OrganizationComponent.java b/src/main/java/com/wansensoft/service/organization/OrganizationComponent.java similarity index 94% rename from src/main/java/com/wansensoft/erp/service/organization/OrganizationComponent.java rename to src/main/java/com/wansensoft/service/organization/OrganizationComponent.java index b96f94bb..9c0aed1a 100644 --- a/src/main/java/com/wansensoft/erp/service/organization/OrganizationComponent.java +++ b/src/main/java/com/wansensoft/service/organization/OrganizationComponent.java @@ -1,7 +1,7 @@ -package com.wansensoft.erp.service.organization; +package com.wansensoft.service.organization; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; +import com.wansensoft.service.ICommonQuery; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/organization/OrganizationResource.java b/src/main/java/com/wansensoft/service/organization/OrganizationResource.java similarity index 73% rename from src/main/java/com/wansensoft/erp/service/organization/OrganizationResource.java rename to src/main/java/com/wansensoft/service/organization/OrganizationResource.java index e22e85ba..7e6d3ba4 100644 --- a/src/main/java/com/wansensoft/erp/service/organization/OrganizationResource.java +++ b/src/main/java/com/wansensoft/service/organization/OrganizationResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.organization; +package com.wansensoft.service.organization; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/organization/OrganizationService.java b/src/main/java/com/wansensoft/service/organization/OrganizationService.java similarity index 94% rename from src/main/java/com/wansensoft/erp/service/organization/OrganizationService.java rename to src/main/java/com/wansensoft/service/organization/OrganizationService.java index c4786ae7..2a7342a7 100644 --- a/src/main/java/com/wansensoft/erp/service/organization/OrganizationService.java +++ b/src/main/java/com/wansensoft/service/organization/OrganizationService.java @@ -1,19 +1,18 @@ -package com.wansensoft.erp.service.organization; +package com.wansensoft.service.organization; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.Organization; -import com.wansensoft.erp.datasource.entities.OrganizationExample; -import com.wansensoft.erp.datasource.entities.User; -import com.wansensoft.erp.datasource.mappers.OrganizationMapper; -import com.wansensoft.erp.datasource.mappers.OrganizationMapperEx; -import com.wansensoft.erp.datasource.vo.TreeNode; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.entities.Organization; +import com.wansensoft.datasource.entities.OrganizationExample; +import com.wansensoft.datasource.entities.User; +import com.wansensoft.datasource.mappers.OrganizationMapper; +import com.wansensoft.datasource.mappers.OrganizationMapperEx; +import com.wansensoft.datasource.vo.TreeNode; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.log.LogService; +import com.wansensoft.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/person/PersonComponent.java b/src/main/java/com/wansensoft/service/person/PersonComponent.java similarity index 90% rename from src/main/java/com/wansensoft/erp/service/person/PersonComponent.java rename to src/main/java/com/wansensoft/service/person/PersonComponent.java index 32364af3..09fcfca4 100644 --- a/src/main/java/com/wansensoft/erp/service/person/PersonComponent.java +++ b/src/main/java/com/wansensoft/service/person/PersonComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.person; +package com.wansensoft.service.person; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/person/PersonResource.java b/src/main/java/com/wansensoft/service/person/PersonResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/person/PersonResource.java rename to src/main/java/com/wansensoft/service/person/PersonResource.java index 46750962..d17a70c3 100644 --- a/src/main/java/com/wansensoft/erp/service/person/PersonResource.java +++ b/src/main/java/com/wansensoft/service/person/PersonResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.person; +package com.wansensoft.service.person; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/person/PersonService.java b/src/main/java/com/wansensoft/service/person/PersonService.java similarity index 91% rename from src/main/java/com/wansensoft/erp/service/person/PersonService.java rename to src/main/java/com/wansensoft/service/person/PersonService.java index 236b355a..453f309b 100644 --- a/src/main/java/com/wansensoft/erp/service/person/PersonService.java +++ b/src/main/java/com/wansensoft/service/person/PersonService.java @@ -1,21 +1,21 @@ -package com.wansensoft.erp.service.person; +package com.wansensoft.service.person; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.AccountHead; -import com.wansensoft.erp.datasource.entities.DepotHead; -import com.wansensoft.erp.datasource.entities.Person; -import com.wansensoft.erp.datasource.entities.PersonExample; -import com.wansensoft.erp.datasource.mappers.AccountHeadMapperEx; -import com.wansensoft.erp.datasource.mappers.DepotHeadMapperEx; -import com.wansensoft.erp.datasource.mappers.PersonMapper; -import com.wansensoft.erp.datasource.mappers.PersonMapperEx; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.entities.AccountHead; +import com.wansensoft.datasource.entities.DepotHead; +import com.wansensoft.datasource.entities.Person; +import com.wansensoft.datasource.entities.PersonExample; +import com.wansensoft.datasource.mappers.AccountHeadMapperEx; +import com.wansensoft.datasource.mappers.DepotHeadMapperEx; +import com.wansensoft.datasource.mappers.PersonMapper; +import com.wansensoft.datasource.mappers.PersonMapperEx; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/platformConfig/PlatformConfigComponent.java b/src/main/java/com/wansensoft/service/platformConfig/PlatformConfigComponent.java similarity index 90% rename from src/main/java/com/wansensoft/erp/service/platformConfig/PlatformConfigComponent.java rename to src/main/java/com/wansensoft/service/platformConfig/PlatformConfigComponent.java index 385fcf21..100c0e2c 100644 --- a/src/main/java/com/wansensoft/erp/service/platformConfig/PlatformConfigComponent.java +++ b/src/main/java/com/wansensoft/service/platformConfig/PlatformConfigComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.platformConfig; +package com.wansensoft.service.platformConfig; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/platformConfig/PlatformConfigResource.java b/src/main/java/com/wansensoft/service/platformConfig/PlatformConfigResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/platformConfig/PlatformConfigResource.java rename to src/main/java/com/wansensoft/service/platformConfig/PlatformConfigResource.java index 37ab5fec..540ae4e1 100644 --- a/src/main/java/com/wansensoft/erp/service/platformConfig/PlatformConfigResource.java +++ b/src/main/java/com/wansensoft/service/platformConfig/PlatformConfigResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.platformConfig; +package com.wansensoft.service.platformConfig; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/platformConfig/PlatformConfigService.java b/src/main/java/com/wansensoft/service/platformConfig/PlatformConfigService.java similarity index 93% rename from src/main/java/com/wansensoft/erp/service/platformConfig/PlatformConfigService.java rename to src/main/java/com/wansensoft/service/platformConfig/PlatformConfigService.java index 66cf424d..7975ffb5 100644 --- a/src/main/java/com/wansensoft/erp/service/platformConfig/PlatformConfigService.java +++ b/src/main/java/com/wansensoft/service/platformConfig/PlatformConfigService.java @@ -1,14 +1,14 @@ -package com.wansensoft.erp.service.platformConfig; +package com.wansensoft.service.platformConfig; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.datasource.entities.PlatformConfig; -import com.wansensoft.erp.datasource.entities.PlatformConfigExample; -import com.wansensoft.erp.datasource.mappers.PlatformConfigMapper; -import com.wansensoft.erp.datasource.mappers.PlatformConfigMapperEx; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.datasource.entities.PlatformConfig; +import com.wansensoft.datasource.entities.PlatformConfigExample; +import com.wansensoft.datasource.mappers.PlatformConfigMapper; +import com.wansensoft.datasource.mappers.PlatformConfigMapperEx; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/redis/RedisService.java b/src/main/java/com/wansensoft/service/redis/RedisService.java similarity index 96% rename from src/main/java/com/wansensoft/erp/service/redis/RedisService.java rename to src/main/java/com/wansensoft/service/redis/RedisService.java index 561b7a0a..0aaa149b 100644 --- a/src/main/java/com/wansensoft/erp/service/redis/RedisService.java +++ b/src/main/java/com/wansensoft/service/redis/RedisService.java @@ -1,7 +1,7 @@ -package com.wansensoft.erp.service.redis; +package com.wansensoft.service.redis; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.utils.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.RedisSerializer; diff --git a/src/main/java/com/wansensoft/erp/service/role/RoleComponent.java b/src/main/java/com/wansensoft/service/role/RoleComponent.java similarity index 90% rename from src/main/java/com/wansensoft/erp/service/role/RoleComponent.java rename to src/main/java/com/wansensoft/service/role/RoleComponent.java index 6804a045..6d02569c 100644 --- a/src/main/java/com/wansensoft/erp/service/role/RoleComponent.java +++ b/src/main/java/com/wansensoft/service/role/RoleComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.role; +package com.wansensoft.service.role; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/role/RoleResource.java b/src/main/java/com/wansensoft/service/role/RoleResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/role/RoleResource.java rename to src/main/java/com/wansensoft/service/role/RoleResource.java index 9faa6708..b1862830 100644 --- a/src/main/java/com/wansensoft/erp/service/role/RoleResource.java +++ b/src/main/java/com/wansensoft/service/role/RoleResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.role; +package com.wansensoft.service.role; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/role/RoleService.java b/src/main/java/com/wansensoft/service/role/RoleService.java similarity index 94% rename from src/main/java/com/wansensoft/erp/service/role/RoleService.java rename to src/main/java/com/wansensoft/service/role/RoleService.java index fc91c269..6bdf7c9a 100644 --- a/src/main/java/com/wansensoft/erp/service/role/RoleService.java +++ b/src/main/java/com/wansensoft/service/role/RoleService.java @@ -1,17 +1,17 @@ -package com.wansensoft.erp.service.role; +package com.wansensoft.service.role; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.datasource.entities.Role; -import com.wansensoft.erp.datasource.entities.RoleEx; -import com.wansensoft.erp.datasource.entities.RoleExample; -import com.wansensoft.erp.datasource.entities.User; -import com.wansensoft.erp.datasource.mappers.RoleMapper; -import com.wansensoft.erp.datasource.mappers.RoleMapperEx; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.datasource.entities.Role; +import com.wansensoft.datasource.entities.RoleEx; +import com.wansensoft.datasource.entities.RoleExample; +import com.wansensoft.datasource.entities.User; +import com.wansensoft.datasource.mappers.RoleMapper; +import com.wansensoft.datasource.mappers.RoleMapperEx; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/sequence/SequenceComponent.java b/src/main/java/com/wansensoft/service/sequence/SequenceComponent.java similarity index 86% rename from src/main/java/com/wansensoft/erp/service/sequence/SequenceComponent.java rename to src/main/java/com/wansensoft/service/sequence/SequenceComponent.java index 4d45269d..2d6cabb5 100644 --- a/src/main/java/com/wansensoft/erp/service/sequence/SequenceComponent.java +++ b/src/main/java/com/wansensoft/service/sequence/SequenceComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.sequence; +package com.wansensoft.service.sequence; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; @@ -37,7 +37,7 @@ public List select(Map map)throws Exception { private List getSequenceList(Map map) throws Exception{ String search = map.get(Constants.SEARCH); String name = StringUtil.getInfo(search, "name"); - return sequenceService.select(name,QueryUtils.offset(map), QueryUtils.rows(map)); + return sequenceService.select(name, QueryUtils.offset(map), QueryUtils.rows(map)); } @Override diff --git a/src/main/java/com/wansensoft/erp/service/sequence/SequenceResource.java b/src/main/java/com/wansensoft/service/sequence/SequenceResource.java similarity index 73% rename from src/main/java/com/wansensoft/erp/service/sequence/SequenceResource.java rename to src/main/java/com/wansensoft/service/sequence/SequenceResource.java index 64384abf..54be8532 100644 --- a/src/main/java/com/wansensoft/erp/service/sequence/SequenceResource.java +++ b/src/main/java/com/wansensoft/service/sequence/SequenceResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.sequence; +package com.wansensoft.service.sequence; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/sequence/SequenceService.java b/src/main/java/com/wansensoft/service/sequence/SequenceService.java similarity index 89% rename from src/main/java/com/wansensoft/erp/service/sequence/SequenceService.java rename to src/main/java/com/wansensoft/service/sequence/SequenceService.java index 06e6242e..8ab42ded 100644 --- a/src/main/java/com/wansensoft/erp/service/sequence/SequenceService.java +++ b/src/main/java/com/wansensoft/service/sequence/SequenceService.java @@ -1,11 +1,11 @@ -package com.wansensoft.erp.service.sequence; +package com.wansensoft.service.sequence; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.datasource.entities.SerialNumber; -import com.wansensoft.erp.datasource.entities.SerialNumberEx; -import com.wansensoft.erp.datasource.mappers.SequenceMapperEx; -import com.wansensoft.erp.exception.JshException; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.datasource.entities.SerialNumber; +import com.wansensoft.datasource.entities.SerialNumberEx; +import com.wansensoft.datasource.mappers.SequenceMapperEx; +import com.wansensoft.exception.JshException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/serialNumber/SerialNumberComponent.java b/src/main/java/com/wansensoft/service/serialNumber/SerialNumberComponent.java similarity index 91% rename from src/main/java/com/wansensoft/erp/service/serialNumber/SerialNumberComponent.java rename to src/main/java/com/wansensoft/service/serialNumber/SerialNumberComponent.java index d8f2915c..b3a68786 100644 --- a/src/main/java/com/wansensoft/erp/service/serialNumber/SerialNumberComponent.java +++ b/src/main/java/com/wansensoft/service/serialNumber/SerialNumberComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.serialNumber; +package com.wansensoft.service.serialNumber; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/serialNumber/SerialNumberResource.java b/src/main/java/com/wansensoft/service/serialNumber/SerialNumberResource.java similarity index 73% rename from src/main/java/com/wansensoft/erp/service/serialNumber/SerialNumberResource.java rename to src/main/java/com/wansensoft/service/serialNumber/SerialNumberResource.java index 29991b2e..806f916a 100644 --- a/src/main/java/com/wansensoft/erp/service/serialNumber/SerialNumberResource.java +++ b/src/main/java/com/wansensoft/service/serialNumber/SerialNumberResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.serialNumber; +package com.wansensoft.service.serialNumber; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/serialNumber/SerialNumberService.java b/src/main/java/com/wansensoft/service/serialNumber/SerialNumberService.java similarity index 96% rename from src/main/java/com/wansensoft/erp/service/serialNumber/SerialNumberService.java rename to src/main/java/com/wansensoft/service/serialNumber/SerialNumberService.java index 8d6fd275..2b6c6dd6 100644 --- a/src/main/java/com/wansensoft/erp/service/serialNumber/SerialNumberService.java +++ b/src/main/java/com/wansensoft/service/serialNumber/SerialNumberService.java @@ -1,18 +1,18 @@ -package com.wansensoft.erp.service.serialNumber; +package com.wansensoft.service.serialNumber; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.*; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.material.MaterialService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; -import com.wansensoft.erp.datasource.mappers.MaterialMapperEx; -import com.wansensoft.erp.datasource.mappers.SerialNumberMapper; -import com.wansensoft.erp.datasource.mappers.SerialNumberMapperEx; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.entities.*; +import com.wansensoft.datasource.mappers.MaterialMapperEx; +import com.wansensoft.datasource.mappers.SerialNumberMapper; +import com.wansensoft.datasource.mappers.SerialNumberMapperEx; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.material.MaterialService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/supplier/SupplierComponent.java b/src/main/java/com/wansensoft/service/supplier/SupplierComponent.java similarity index 92% rename from src/main/java/com/wansensoft/erp/service/supplier/SupplierComponent.java rename to src/main/java/com/wansensoft/service/supplier/SupplierComponent.java index 5a34635d..54190ce0 100644 --- a/src/main/java/com/wansensoft/erp/service/supplier/SupplierComponent.java +++ b/src/main/java/com/wansensoft/service/supplier/SupplierComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.supplier; +package com.wansensoft.service.supplier; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/supplier/SupplierResource.java b/src/main/java/com/wansensoft/service/supplier/SupplierResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/supplier/SupplierResource.java rename to src/main/java/com/wansensoft/service/supplier/SupplierResource.java index 4363067e..26e61cba 100644 --- a/src/main/java/com/wansensoft/erp/service/supplier/SupplierResource.java +++ b/src/main/java/com/wansensoft/service/supplier/SupplierResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.supplier; +package com.wansensoft.service.supplier; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/supplier/SupplierService.java b/src/main/java/com/wansensoft/service/supplier/SupplierService.java similarity index 96% rename from src/main/java/com/wansensoft/erp/service/supplier/SupplierService.java rename to src/main/java/com/wansensoft/service/supplier/SupplierService.java index ffd1f184..3bd2bc58 100644 --- a/src/main/java/com/wansensoft/erp/service/supplier/SupplierService.java +++ b/src/main/java/com/wansensoft/service/supplier/SupplierService.java @@ -1,23 +1,23 @@ -package com.wansensoft.erp.service.supplier; +package com.wansensoft.service.supplier; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.*; -import com.wansensoft.erp.datasource.mappers.*; -import com.wansensoft.erp.datasource.vo.DepotHeadVo4StatementAccount; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.accountHead.AccountHeadService; -import com.wansensoft.erp.service.depotHead.DepotHeadService; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.systemConfig.SystemConfigService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.service.userBusiness.UserBusinessService; -import com.wansensoft.erp.utils.BaseResponseInfo; -import com.wansensoft.erp.utils.ExcelUtils; -import com.wansensoft.erp.utils.StringUtil; -import com.wansensoft.erp.utils.Tools; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.entities.*; +import com.wansensoft.datasource.mappers.*; +import com.wansensoft.datasource.vo.DepotHeadVo4StatementAccount; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.accountHead.AccountHeadService; +import com.wansensoft.service.depotHead.DepotHeadService; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.systemConfig.SystemConfigService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.service.userBusiness.UserBusinessService; +import com.wansensoft.utils.BaseResponseInfo; +import com.wansensoft.utils.ExcelUtils; +import com.wansensoft.utils.StringUtil; +import com.wansensoft.utils.Tools; import jxl.Sheet; import jxl.Workbook; import org.slf4j.Logger; diff --git a/src/main/java/com/wansensoft/erp/service/systemConfig/SystemConfigComponent.java b/src/main/java/com/wansensoft/service/systemConfig/SystemConfigComponent.java similarity index 90% rename from src/main/java/com/wansensoft/erp/service/systemConfig/SystemConfigComponent.java rename to src/main/java/com/wansensoft/service/systemConfig/SystemConfigComponent.java index 15c154c6..24dd9aa6 100644 --- a/src/main/java/com/wansensoft/erp/service/systemConfig/SystemConfigComponent.java +++ b/src/main/java/com/wansensoft/service/systemConfig/SystemConfigComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.systemConfig; +package com.wansensoft.service.systemConfig; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/systemConfig/SystemConfigResource.java b/src/main/java/com/wansensoft/service/systemConfig/SystemConfigResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/systemConfig/SystemConfigResource.java rename to src/main/java/com/wansensoft/service/systemConfig/SystemConfigResource.java index e957cc81..ddba1bf7 100644 --- a/src/main/java/com/wansensoft/erp/service/systemConfig/SystemConfigResource.java +++ b/src/main/java/com/wansensoft/service/systemConfig/SystemConfigResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.systemConfig; +package com.wansensoft.service.systemConfig; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/systemConfig/SystemConfigService.java b/src/main/java/com/wansensoft/service/systemConfig/SystemConfigService.java similarity index 95% rename from src/main/java/com/wansensoft/erp/service/systemConfig/SystemConfigService.java rename to src/main/java/com/wansensoft/service/systemConfig/SystemConfigService.java index 92efb4a9..35cddbf3 100644 --- a/src/main/java/com/wansensoft/erp/service/systemConfig/SystemConfigService.java +++ b/src/main/java/com/wansensoft/service/systemConfig/SystemConfigService.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.service.systemConfig; +package com.wansensoft.service.systemConfig; import com.alibaba.fastjson.JSONObject; import com.aliyun.oss.ClientException; @@ -6,19 +6,19 @@ import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.OSSException; import com.aliyun.oss.model.PutObjectRequest; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.datasource.entities.SystemConfig; -import com.wansensoft.erp.datasource.entities.SystemConfigExample; -import com.wansensoft.erp.datasource.entities.User; -import com.wansensoft.erp.datasource.mappers.SystemConfigMapper; -import com.wansensoft.erp.datasource.mappers.SystemConfigMapperEx; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.platformConfig.PlatformConfigService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.FileUtils; -import com.wansensoft.erp.utils.StringUtil; -import com.wansensoft.erp.utils.Tools; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.datasource.entities.SystemConfig; +import com.wansensoft.datasource.entities.SystemConfigExample; +import com.wansensoft.datasource.entities.User; +import com.wansensoft.datasource.mappers.SystemConfigMapper; +import com.wansensoft.datasource.mappers.SystemConfigMapperEx; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.platformConfig.PlatformConfigService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.FileUtils; +import com.wansensoft.utils.StringUtil; +import com.wansensoft.utils.Tools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/wansensoft/erp/service/tenant/TenantComponent.java b/src/main/java/com/wansensoft/service/tenant/TenantComponent.java similarity index 91% rename from src/main/java/com/wansensoft/erp/service/tenant/TenantComponent.java rename to src/main/java/com/wansensoft/service/tenant/TenantComponent.java index 006a6cec..c17a6e03 100644 --- a/src/main/java/com/wansensoft/erp/service/tenant/TenantComponent.java +++ b/src/main/java/com/wansensoft/service/tenant/TenantComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.tenant; +package com.wansensoft.service.tenant; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/tenant/TenantResource.java b/src/main/java/com/wansensoft/service/tenant/TenantResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/tenant/TenantResource.java rename to src/main/java/com/wansensoft/service/tenant/TenantResource.java index 1612333d..f29296f9 100644 --- a/src/main/java/com/wansensoft/erp/service/tenant/TenantResource.java +++ b/src/main/java/com/wansensoft/service/tenant/TenantResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.tenant; +package com.wansensoft.service.tenant; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/tenant/TenantService.java b/src/main/java/com/wansensoft/service/tenant/TenantService.java similarity index 91% rename from src/main/java/com/wansensoft/erp/service/tenant/TenantService.java rename to src/main/java/com/wansensoft/service/tenant/TenantService.java index 564b2df9..a7e8dafe 100644 --- a/src/main/java/com/wansensoft/erp/service/tenant/TenantService.java +++ b/src/main/java/com/wansensoft/service/tenant/TenantService.java @@ -1,18 +1,18 @@ -package com.wansensoft.erp.service.tenant; +package com.wansensoft.service.tenant; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.datasource.entities.Tenant; -import com.wansensoft.erp.datasource.entities.TenantEx; -import com.wansensoft.erp.datasource.entities.TenantExample; -import com.wansensoft.erp.datasource.mappers.TenantMapper; -import com.wansensoft.erp.datasource.mappers.TenantMapperEx; -import com.wansensoft.erp.datasource.mappers.UserMapperEx; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; -import com.wansensoft.erp.utils.Tools; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.datasource.entities.Tenant; +import com.wansensoft.datasource.entities.TenantEx; +import com.wansensoft.datasource.entities.TenantExample; +import com.wansensoft.datasource.mappers.TenantMapper; +import com.wansensoft.datasource.mappers.TenantMapperEx; +import com.wansensoft.datasource.mappers.UserMapperEx; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.StringUtil; +import com.wansensoft.utils.Tools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/wansensoft/erp/service/unit/UnitComponent.java b/src/main/java/com/wansensoft/service/unit/UnitComponent.java similarity index 89% rename from src/main/java/com/wansensoft/erp/service/unit/UnitComponent.java rename to src/main/java/com/wansensoft/service/unit/UnitComponent.java index 587e0481..6f549b62 100644 --- a/src/main/java/com/wansensoft/erp/service/unit/UnitComponent.java +++ b/src/main/java/com/wansensoft/service/unit/UnitComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.unit; +package com.wansensoft.service.unit; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/unit/UnitResource.java b/src/main/java/com/wansensoft/service/unit/UnitResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/unit/UnitResource.java rename to src/main/java/com/wansensoft/service/unit/UnitResource.java index 0dbc4965..b35d5011 100644 --- a/src/main/java/com/wansensoft/erp/service/unit/UnitResource.java +++ b/src/main/java/com/wansensoft/service/unit/UnitResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.unit; +package com.wansensoft.service.unit; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/unit/UnitService.java b/src/main/java/com/wansensoft/service/unit/UnitService.java similarity index 92% rename from src/main/java/com/wansensoft/erp/service/unit/UnitService.java rename to src/main/java/com/wansensoft/service/unit/UnitService.java index ae682644..e6933e1c 100644 --- a/src/main/java/com/wansensoft/erp/service/unit/UnitService.java +++ b/src/main/java/com/wansensoft/service/unit/UnitService.java @@ -1,20 +1,20 @@ -package com.wansensoft.erp.service.unit; +package com.wansensoft.service.unit; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.entities.Material; -import com.wansensoft.erp.datasource.entities.Unit; -import com.wansensoft.erp.datasource.entities.UnitExample; -import com.wansensoft.erp.datasource.entities.User; -import com.wansensoft.erp.datasource.mappers.MaterialMapperEx; -import com.wansensoft.erp.datasource.mappers.UnitMapper; -import com.wansensoft.erp.datasource.mappers.UnitMapperEx; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.entities.Material; +import com.wansensoft.datasource.entities.Unit; +import com.wansensoft.datasource.entities.UnitExample; +import com.wansensoft.datasource.entities.User; +import com.wansensoft.datasource.mappers.MaterialMapperEx; +import com.wansensoft.datasource.mappers.UnitMapper; +import com.wansensoft.datasource.mappers.UnitMapperEx; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/user/UserComponent.java b/src/main/java/com/wansensoft/service/user/UserComponent.java similarity index 90% rename from src/main/java/com/wansensoft/erp/service/user/UserComponent.java rename to src/main/java/com/wansensoft/service/user/UserComponent.java index 0f33f9ec..a26cf7e8 100644 --- a/src/main/java/com/wansensoft/erp/service/user/UserComponent.java +++ b/src/main/java/com/wansensoft/service/user/UserComponent.java @@ -1,10 +1,10 @@ -package com.wansensoft.erp.service.user; +package com.wansensoft.service.user; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.service.ICommonQuery; -import com.wansensoft.erp.utils.Constants; -import com.wansensoft.erp.utils.QueryUtils; -import com.wansensoft.erp.utils.StringUtil; +import com.wansensoft.service.ICommonQuery; +import com.wansensoft.utils.Constants; +import com.wansensoft.utils.QueryUtils; +import com.wansensoft.utils.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/user/UserResource.java b/src/main/java/com/wansensoft/service/user/UserResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/user/UserResource.java rename to src/main/java/com/wansensoft/service/user/UserResource.java index c63ec6ea..faed8cf4 100644 --- a/src/main/java/com/wansensoft/erp/service/user/UserResource.java +++ b/src/main/java/com/wansensoft/service/user/UserResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.user; +package com.wansensoft.service.user; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/user/UserService.java b/src/main/java/com/wansensoft/service/user/UserService.java similarity index 96% rename from src/main/java/com/wansensoft/erp/service/user/UserService.java rename to src/main/java/com/wansensoft/service/user/UserService.java index 3b48e7e5..46bcf22a 100644 --- a/src/main/java/com/wansensoft/erp/service/user/UserService.java +++ b/src/main/java/com/wansensoft/service/user/UserService.java @@ -1,29 +1,29 @@ -package com.wansensoft.erp.service.user; +package com.wansensoft.service.user; -import com.wansensoft.erp.datasource.entities.*; -import com.wansensoft.erp.exception.BusinessParamCheckingException; -import com.wansensoft.erp.service.functions.FunctionService; -import com.wansensoft.erp.service.platformConfig.PlatformConfigService; -import com.wansensoft.erp.service.redis.RedisService; -import com.wansensoft.erp.service.role.RoleService; -import com.wansensoft.erp.utils.HttpClient; -import com.wansensoft.erp.service.tenant.TenantService; +import com.wansensoft.datasource.entities.*; +import com.wansensoft.exception.BusinessParamCheckingException; +import com.wansensoft.service.functions.FunctionService; +import com.wansensoft.service.platformConfig.PlatformConfigService; +import com.wansensoft.service.redis.RedisService; +import com.wansensoft.service.role.RoleService; +import com.wansensoft.utils.HttpClient; +import com.wansensoft.service.tenant.TenantService; +import com.wansensoft.service.log.LogService; +import com.wansensoft.utils.ExceptionCodeConstants; +import com.wansensoft.utils.StringUtil; +import com.wansensoft.utils.Tools; import org.springframework.util.StringUtils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.constants.ExceptionConstants; -import com.wansensoft.erp.datasource.mappers.UserMapper; -import com.wansensoft.erp.datasource.mappers.UserMapperEx; -import com.wansensoft.erp.datasource.vo.TreeNodeEx; -import com.wansensoft.erp.exception.BusinessRunTimeException; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.orgaUserRel.OrgaUserRelService; -import com.wansensoft.erp.service.userBusiness.UserBusinessService; -import com.wansensoft.erp.utils.ExceptionCodeConstants; -import com.wansensoft.erp.utils.StringUtil; -import com.wansensoft.erp.utils.Tools; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.constants.ExceptionConstants; +import com.wansensoft.datasource.mappers.UserMapper; +import com.wansensoft.datasource.mappers.UserMapperEx; +import com.wansensoft.datasource.vo.TreeNodeEx; +import com.wansensoft.exception.BusinessRunTimeException; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.orgaUserRel.OrgaUserRelService; +import com.wansensoft.service.userBusiness.UserBusinessService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/service/userBusiness/UserBusinessComponent.java b/src/main/java/com/wansensoft/service/userBusiness/UserBusinessComponent.java similarity index 92% rename from src/main/java/com/wansensoft/erp/service/userBusiness/UserBusinessComponent.java rename to src/main/java/com/wansensoft/service/userBusiness/UserBusinessComponent.java index 5b3d7a76..92c0182a 100644 --- a/src/main/java/com/wansensoft/erp/service/userBusiness/UserBusinessComponent.java +++ b/src/main/java/com/wansensoft/service/userBusiness/UserBusinessComponent.java @@ -1,8 +1,8 @@ -package com.wansensoft.erp.service.userBusiness; +package com.wansensoft.service.userBusiness; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.service.ICommonQuery; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.service.ICommonQuery; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/src/main/java/com/wansensoft/erp/service/userBusiness/UserBusinessResource.java b/src/main/java/com/wansensoft/service/userBusiness/UserBusinessResource.java similarity index 72% rename from src/main/java/com/wansensoft/erp/service/userBusiness/UserBusinessResource.java rename to src/main/java/com/wansensoft/service/userBusiness/UserBusinessResource.java index 4cb62ca1..5982c336 100644 --- a/src/main/java/com/wansensoft/erp/service/userBusiness/UserBusinessResource.java +++ b/src/main/java/com/wansensoft/service/userBusiness/UserBusinessResource.java @@ -1,6 +1,6 @@ -package com.wansensoft.erp.service.userBusiness; +package com.wansensoft.service.userBusiness; -import com.wansensoft.erp.service.ResourceInfo; +import com.wansensoft.service.ResourceInfo; import java.lang.annotation.*; diff --git a/src/main/java/com/wansensoft/erp/service/userBusiness/UserBusinessService.java b/src/main/java/com/wansensoft/service/userBusiness/UserBusinessService.java similarity index 91% rename from src/main/java/com/wansensoft/erp/service/userBusiness/UserBusinessService.java rename to src/main/java/com/wansensoft/service/userBusiness/UserBusinessService.java index 05a8c235..8bce6d10 100644 --- a/src/main/java/com/wansensoft/erp/service/userBusiness/UserBusinessService.java +++ b/src/main/java/com/wansensoft/service/userBusiness/UserBusinessService.java @@ -1,18 +1,18 @@ -package com.wansensoft.erp.service.userBusiness; +package com.wansensoft.service.userBusiness; import com.alibaba.fastjson.JSONObject; -import com.wansensoft.erp.constants.BusinessConstants; -import com.wansensoft.erp.datasource.mappers.UserBusinessMapper; -import com.wansensoft.erp.datasource.mappers.UserBusinessMapperEx; -import com.wansensoft.erp.exception.JshException; -import com.wansensoft.erp.service.CommonQueryManager; -import com.wansensoft.erp.service.functions.FunctionService; -import com.wansensoft.erp.service.log.LogService; -import com.wansensoft.erp.service.user.UserService; -import com.wansensoft.erp.utils.Tools; -import com.wansensoft.erp.datasource.entities.User; -import com.wansensoft.erp.datasource.entities.UserBusiness; -import com.wansensoft.erp.datasource.entities.UserBusinessExample; +import com.wansensoft.constants.BusinessConstants; +import com.wansensoft.datasource.entities.User; +import com.wansensoft.datasource.entities.UserBusiness; +import com.wansensoft.datasource.entities.UserBusinessExample; +import com.wansensoft.datasource.mappers.UserBusinessMapper; +import com.wansensoft.datasource.mappers.UserBusinessMapperEx; +import com.wansensoft.exception.JshException; +import com.wansensoft.service.CommonQueryManager; +import com.wansensoft.service.functions.FunctionService; +import com.wansensoft.service.log.LogService; +import com.wansensoft.service.user.UserService; +import com.wansensoft.utils.Tools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wansensoft/erp/utils/AnnotationUtils.java b/src/main/java/com/wansensoft/utils/AnnotationUtils.java similarity index 96% rename from src/main/java/com/wansensoft/erp/utils/AnnotationUtils.java rename to src/main/java/com/wansensoft/utils/AnnotationUtils.java index 2c15be13..4640d4d3 100644 --- a/src/main/java/com/wansensoft/erp/utils/AnnotationUtils.java +++ b/src/main/java/com/wansensoft/utils/AnnotationUtils.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; import java.lang.annotation.Annotation; import java.lang.annotation.Documented; diff --git a/src/main/java/com/wansensoft/erp/utils/BaseResponseInfo.java b/src/main/java/com/wansensoft/utils/BaseResponseInfo.java similarity index 80% rename from src/main/java/com/wansensoft/erp/utils/BaseResponseInfo.java rename to src/main/java/com/wansensoft/utils/BaseResponseInfo.java index c26ee2db..d3032866 100644 --- a/src/main/java/com/wansensoft/erp/utils/BaseResponseInfo.java +++ b/src/main/java/com/wansensoft/utils/BaseResponseInfo.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; public class BaseResponseInfo { public int code; diff --git a/src/main/java/com/wansensoft/erp/utils/ColumnPropertyUtil.java b/src/main/java/com/wansensoft/utils/ColumnPropertyUtil.java similarity index 98% rename from src/main/java/com/wansensoft/erp/utils/ColumnPropertyUtil.java rename to src/main/java/com/wansensoft/utils/ColumnPropertyUtil.java index a912e724..968b8d67 100644 --- a/src/main/java/com/wansensoft/erp/utils/ColumnPropertyUtil.java +++ b/src/main/java/com/wansensoft/utils/ColumnPropertyUtil.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; /** * @author jishenghua qq752718920 2018-10-7 15:26:27 diff --git a/src/main/java/com/wansensoft/erp/utils/ComputerInfo.java b/src/main/java/com/wansensoft/utils/ComputerInfo.java similarity index 99% rename from src/main/java/com/wansensoft/erp/utils/ComputerInfo.java rename to src/main/java/com/wansensoft/utils/ComputerInfo.java index 21776b29..7f64b6a7 100644 --- a/src/main/java/com/wansensoft/erp/utils/ComputerInfo.java +++ b/src/main/java/com/wansensoft/utils/ComputerInfo.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/com/wansensoft/erp/utils/Constants.java b/src/main/java/com/wansensoft/utils/Constants.java similarity index 96% rename from src/main/java/com/wansensoft/erp/utils/Constants.java rename to src/main/java/com/wansensoft/utils/Constants.java index fa9b518e..92382fc6 100644 --- a/src/main/java/com/wansensoft/erp/utils/Constants.java +++ b/src/main/java/com/wansensoft/utils/Constants.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; import java.util.UUID; diff --git a/src/main/java/com/wansensoft/erp/utils/ErpInfo.java b/src/main/java/com/wansensoft/utils/ErpInfo.java similarity index 96% rename from src/main/java/com/wansensoft/erp/utils/ErpInfo.java rename to src/main/java/com/wansensoft/utils/ErpInfo.java index 00071309..0785c539 100644 --- a/src/main/java/com/wansensoft/erp/utils/ErpInfo.java +++ b/src/main/java/com/wansensoft/utils/ErpInfo.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; /** * diff --git a/src/main/java/com/wansensoft/erp/utils/ExcelUtils.java b/src/main/java/com/wansensoft/utils/ExcelUtils.java similarity index 99% rename from src/main/java/com/wansensoft/erp/utils/ExcelUtils.java rename to src/main/java/com/wansensoft/utils/ExcelUtils.java index 9366254c..ed2fd82d 100644 --- a/src/main/java/com/wansensoft/erp/utils/ExcelUtils.java +++ b/src/main/java/com/wansensoft/utils/ExcelUtils.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; import java.io.*; import java.util.*; diff --git a/src/main/java/com/wansensoft/erp/utils/ExceptionCodeConstants.java b/src/main/java/com/wansensoft/utils/ExceptionCodeConstants.java similarity index 96% rename from src/main/java/com/wansensoft/erp/utils/ExceptionCodeConstants.java rename to src/main/java/com/wansensoft/utils/ExceptionCodeConstants.java index 1e46aba0..6fdfdc73 100644 --- a/src/main/java/com/wansensoft/erp/utils/ExceptionCodeConstants.java +++ b/src/main/java/com/wansensoft/utils/ExceptionCodeConstants.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; public interface ExceptionCodeConstants { /** diff --git a/src/main/java/com/wansensoft/erp/utils/ExtJsonUtils.java b/src/main/java/com/wansensoft/utils/ExtJsonUtils.java similarity index 99% rename from src/main/java/com/wansensoft/erp/utils/ExtJsonUtils.java rename to src/main/java/com/wansensoft/utils/ExtJsonUtils.java index 1b17a0ab..774d912a 100644 --- a/src/main/java/com/wansensoft/erp/utils/ExtJsonUtils.java +++ b/src/main/java/com/wansensoft/utils/ExtJsonUtils.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/wansensoft/erp/utils/FileUtils.java b/src/main/java/com/wansensoft/utils/FileUtils.java similarity index 99% rename from src/main/java/com/wansensoft/erp/utils/FileUtils.java rename to src/main/java/com/wansensoft/utils/FileUtils.java index 28bd9253..beccfdbd 100644 --- a/src/main/java/com/wansensoft/erp/utils/FileUtils.java +++ b/src/main/java/com/wansensoft/utils/FileUtils.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; import java.io.*; import java.util.*; diff --git a/src/main/java/com/wansensoft/erp/utils/HttpClient.java b/src/main/java/com/wansensoft/utils/HttpClient.java similarity index 98% rename from src/main/java/com/wansensoft/erp/utils/HttpClient.java rename to src/main/java/com/wansensoft/utils/HttpClient.java index c190435e..06ebd598 100644 --- a/src/main/java/com/wansensoft/erp/utils/HttpClient.java +++ b/src/main/java/com/wansensoft/utils/HttpClient.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; import com.alibaba.fastjson.JSONObject; import org.apache.http.HttpEntity; diff --git a/src/main/java/com/wansensoft/erp/utils/JsonUtils.java b/src/main/java/com/wansensoft/utils/JsonUtils.java similarity index 92% rename from src/main/java/com/wansensoft/erp/utils/JsonUtils.java rename to src/main/java/com/wansensoft/utils/JsonUtils.java index b176ab09..84943da6 100644 --- a/src/main/java/com/wansensoft/erp/utils/JsonUtils.java +++ b/src/main/java/com/wansensoft/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/wansensoft/erp/utils/OrderUtils.java b/src/main/java/com/wansensoft/utils/OrderUtils.java similarity index 98% rename from src/main/java/com/wansensoft/erp/utils/OrderUtils.java rename to src/main/java/com/wansensoft/utils/OrderUtils.java index b031d8f9..7f3a7f25 100644 --- a/src/main/java/com/wansensoft/erp/utils/OrderUtils.java +++ b/src/main/java/com/wansensoft/utils/OrderUtils.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; /** * @author jishenghua qq752718920 2018-10-7 15:26:27 diff --git a/src/main/java/com/wansensoft/erp/utils/PageQueryInfo.java b/src/main/java/com/wansensoft/utils/PageQueryInfo.java similarity index 93% rename from src/main/java/com/wansensoft/erp/utils/PageQueryInfo.java rename to src/main/java/com/wansensoft/utils/PageQueryInfo.java index 73725859..cb9f4ab0 100644 --- a/src/main/java/com/wansensoft/erp/utils/PageQueryInfo.java +++ b/src/main/java/com/wansensoft/utils/PageQueryInfo.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; import java.util.List; diff --git a/src/main/java/com/wansensoft/erp/utils/ParamUtils.java b/src/main/java/com/wansensoft/utils/ParamUtils.java similarity index 98% rename from src/main/java/com/wansensoft/erp/utils/ParamUtils.java rename to src/main/java/com/wansensoft/utils/ParamUtils.java index 5406d96d..a8ff3832 100644 --- a/src/main/java/com/wansensoft/erp/utils/ParamUtils.java +++ b/src/main/java/com/wansensoft/utils/ParamUtils.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; import jakarta.servlet.http.HttpServletRequest; import java.util.Collections; diff --git a/src/main/java/com/wansensoft/erp/utils/QueryUtils.java b/src/main/java/com/wansensoft/utils/QueryUtils.java similarity index 96% rename from src/main/java/com/wansensoft/erp/utils/QueryUtils.java rename to src/main/java/com/wansensoft/utils/QueryUtils.java index 0526746d..72fffe35 100644 --- a/src/main/java/com/wansensoft/erp/utils/QueryUtils.java +++ b/src/main/java/com/wansensoft/utils/QueryUtils.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -8,8 +8,8 @@ import java.util.List; import java.util.Map; -import static com.wansensoft.erp.utils.Constants.CURRENT_PAGE; -import static com.wansensoft.erp.utils.Constants.PAGE_SIZE; +import static com.wansensoft.utils.Constants.CURRENT_PAGE; +import static com.wansensoft.utils.Constants.PAGE_SIZE; /** * @author jishenghua qq752718920 2018-10-7 15:26:27 diff --git a/src/main/java/com/wansensoft/erp/utils/RandImageUtil.java b/src/main/java/com/wansensoft/utils/RandImageUtil.java similarity index 99% rename from src/main/java/com/wansensoft/erp/utils/RandImageUtil.java rename to src/main/java/com/wansensoft/utils/RandImageUtil.java index 251b8f94..51493010 100644 --- a/src/main/java/com/wansensoft/erp/utils/RandImageUtil.java +++ b/src/main/java/com/wansensoft/utils/RandImageUtil.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; import javax.imageio.ImageIO; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/wansensoft/erp/utils/RegExpTools.java b/src/main/java/com/wansensoft/utils/RegExpTools.java similarity index 99% rename from src/main/java/com/wansensoft/erp/utils/RegExpTools.java rename to src/main/java/com/wansensoft/utils/RegExpTools.java index f82959d5..cbf22556 100644 --- a/src/main/java/com/wansensoft/erp/utils/RegExpTools.java +++ b/src/main/java/com/wansensoft/utils/RegExpTools.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; import org.springframework.util.Assert; diff --git a/src/main/java/com/wansensoft/erp/utils/ResponseCode.java b/src/main/java/com/wansensoft/utils/ResponseCode.java similarity index 93% rename from src/main/java/com/wansensoft/erp/utils/ResponseCode.java rename to src/main/java/com/wansensoft/utils/ResponseCode.java index 94fd4e3f..5fc3e4a9 100644 --- a/src/main/java/com/wansensoft/erp/utils/ResponseCode.java +++ b/src/main/java/com/wansensoft/utils/ResponseCode.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; import com.alibaba.fastjson.annotation.JSONCreator; import com.alibaba.fastjson.annotation.JSONField; diff --git a/src/main/java/com/wansensoft/erp/utils/ResponseJsonUtil.java b/src/main/java/com/wansensoft/utils/ResponseJsonUtil.java similarity index 98% rename from src/main/java/com/wansensoft/erp/utils/ResponseJsonUtil.java rename to src/main/java/com/wansensoft/utils/ResponseJsonUtil.java index bbdaeb39..f9fa8748 100644 --- a/src/main/java/com/wansensoft/erp/utils/ResponseJsonUtil.java +++ b/src/main/java/com/wansensoft/utils/ResponseJsonUtil.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; diff --git a/src/main/java/com/wansensoft/erp/utils/StringUtil.java b/src/main/java/com/wansensoft/utils/StringUtil.java similarity index 99% rename from src/main/java/com/wansensoft/erp/utils/StringUtil.java rename to src/main/java/com/wansensoft/utils/StringUtil.java index ae319fe5..ab98a213 100644 --- a/src/main/java/com/wansensoft/erp/utils/StringUtil.java +++ b/src/main/java/com/wansensoft/utils/StringUtil.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; import org.springframework.util.StringUtils; import com.alibaba.fastjson.JSON; diff --git a/src/main/java/com/wansensoft/erp/utils/Tools.java b/src/main/java/com/wansensoft/utils/Tools.java similarity index 99% rename from src/main/java/com/wansensoft/erp/utils/Tools.java rename to src/main/java/com/wansensoft/utils/Tools.java index b080e082..31a47b08 100644 --- a/src/main/java/com/wansensoft/erp/utils/Tools.java +++ b/src/main/java/com/wansensoft/utils/Tools.java @@ -1,4 +1,4 @@ -package com.wansensoft.erp.utils; +package com.wansensoft.utils; import org.springframework.util.StringUtils; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/resources/mapper_xml/AccountHeadMapper.xml b/src/main/resources/mapper_xml/AccountHeadMapper.xml index dfadde0f..7a55990d 100644 --- a/src/main/resources/mapper_xml/AccountHeadMapper.xml +++ b/src/main/resources/mapper_xml/AccountHeadMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -82,7 +82,7 @@ id, type, organ_id, hands_person_id, creator, change_amount, discount_money, total_price, account_id, bill_no, bill_time, remark, file_name, status, source, tenant_id, delete_flag - select distinct @@ -106,13 +106,13 @@ delete from jsh_account_head where id = #{id,jdbcType=BIGINT} - + delete from jsh_account_head - + insert into jsh_account_head (id, type, organ_id, hands_person_id, creator, change_amount, discount_money, total_price, account_id, @@ -126,7 +126,7 @@ #{fileName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{source,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) - + insert into jsh_account_head @@ -235,7 +235,7 @@ - select count(*) from jsh_account_head @@ -323,7 +323,7 @@ - + update jsh_account_head @@ -377,7 +377,7 @@ where id = #{id,jdbcType=BIGINT} - + update jsh_account_head set type = #{type,jdbcType=VARCHAR}, organ_id = #{organId,jdbcType=BIGINT}, diff --git a/src/main/resources/mapper_xml/AccountHeadMapperEx.xml b/src/main/resources/mapper_xml/AccountHeadMapperEx.xml index 4738bf8f..eef7aca1 100644 --- a/src/main/resources/mapper_xml/AccountHeadMapperEx.xml +++ b/src/main/resources/mapper_xml/AccountHeadMapperEx.xml @@ -1,15 +1,15 @@ - + - + - select distinct ah.*, s.supplier OrganName, p.Name HandsPersonName, u.username userName, a.Name AccountName from jsh_account_head ah left join jsh_account_item ai on ah.id=ai.header_id and ifnull(ai.delete_flag,'0') !='1' @@ -133,7 +133,7 @@ and ifnull(ah.delete_flag,'0') !='1') tb - select ah.*, s.supplier OrganName, p.Name HandsPersonName, a.Name AccountName from jsh_account_head ah left join jsh_supplier s on ah.organ_id=s.id and ifnull(s.delete_Flag,'0') !='1' @@ -155,9 +155,9 @@ ) - select - + from jsh_account_head where 1=1 and account_id in ( @@ -167,9 +167,9 @@ ) and ifnull(delete_flag,'0') !='1' - select - + from jsh_account_head where 1=1 and organ_id in ( @@ -179,9 +179,9 @@ ) and ifnull(delete_flag,'0') !='1' - select - + from jsh_account_head where 1=1 and hands_person_id in ( @@ -192,7 +192,7 @@ and ifnull(delete_flag,'0') !='1' - select ai.bill_id from jsh_account_head ah left join jsh_account_item ai on ah.id=ai.header_id and ifnull(ai.delete_flag,'0') !='1' where 1=1 @@ -205,7 +205,7 @@ and ifnull(ah.delete_flag,'0') !='1' - select ah.bill_no from jsh_account_head ah left join jsh_account_item ai on ah.id=ai.header_id and ifnull(ai.delete_flag,'0') !='1' where ai.bill_id=#{billId} diff --git a/src/main/resources/mapper_xml/AccountItemMapper.xml b/src/main/resources/mapper_xml/AccountItemMapper.xml index cf0129c7..fddcd0ae 100644 --- a/src/main/resources/mapper_xml/AccountItemMapper.xml +++ b/src/main/resources/mapper_xml/AccountItemMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -76,7 +76,7 @@ id, header_id, account_id, in_out_item_id, bill_id, need_debt, finish_debt, each_amount, remark, tenant_id, delete_flag - select distinct @@ -100,13 +100,13 @@ delete from jsh_account_item where id = #{id,jdbcType=BIGINT} - + delete from jsh_account_item - + insert into jsh_account_item (id, header_id, account_id, in_out_item_id, bill_id, need_debt, finish_debt, each_amount, remark, @@ -116,7 +116,7 @@ #{finishDebt,jdbcType=DECIMAL}, #{eachAmount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) - + insert into jsh_account_item @@ -189,7 +189,7 @@ - select count(*) from jsh_account_item @@ -253,7 +253,7 @@ - + update jsh_account_item @@ -289,7 +289,7 @@ where id = #{id,jdbcType=BIGINT} - + update jsh_account_item set header_id = #{headerId,jdbcType=BIGINT}, account_id = #{accountId,jdbcType=BIGINT}, diff --git a/src/main/resources/mapper_xml/AccountItemMapperEx.xml b/src/main/resources/mapper_xml/AccountItemMapperEx.xml index 8ce60521..5d890611 100644 --- a/src/main/resources/mapper_xml/AccountItemMapperEx.xml +++ b/src/main/resources/mapper_xml/AccountItemMapperEx.xml @@ -1,14 +1,14 @@ - + - + - select * FROM jsh_account_item where 1=1 @@ -47,7 +47,7 @@ and ifnull(delete_flag,'0') !='1' - select ai.*,a.Name AccountName,ioi.Name InOutItemName, dh.number billNumber from jsh_account_item ai left join jsh_account a on ai.account_id=a.id and ifnull(a.delete_Flag,'0') !='1' left join jsh_in_out_item ioi on ai.in_out_item_id = ioi.id and ifnull(ioi.delete_Flag,'0') !='1' @@ -66,9 +66,9 @@ ) - select - + from jsh_account_item where 1=1 and account_id in ( @@ -78,9 +78,9 @@ ) and ifnull(delete_flag,'0') !='1' - select - + from jsh_account_item where 1=1 and header_id in ( @@ -90,9 +90,9 @@ ) and ifnull(delete_flag,'0') !='1' - select - + from jsh_account_item where 1=1 and in_out_item_id in ( diff --git a/src/main/resources/mapper_xml/AccountMapper.xml b/src/main/resources/mapper_xml/AccountMapper.xml index 0377a9d9..fa078499 100644 --- a/src/main/resources/mapper_xml/AccountMapper.xml +++ b/src/main/resources/mapper_xml/AccountMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -76,7 +76,7 @@ id, name, serial_no, initial_amount, current_amount, remark, enabled, sort, is_default, tenant_id, delete_flag - select distinct @@ -100,13 +100,13 @@ delete from jsh_account where id = #{id,jdbcType=BIGINT} - + delete from jsh_account - + insert into jsh_account (id, name, serial_no, initial_amount, current_amount, remark, enabled, sort, is_default, tenant_id, @@ -116,7 +116,7 @@ #{enabled,jdbcType=BIT}, #{sort,jdbcType=VARCHAR}, #{isDefault,jdbcType=BIT}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) - + insert into jsh_account @@ -189,7 +189,7 @@ - select count(*) from jsh_account @@ -253,7 +253,7 @@ - + update jsh_account @@ -289,7 +289,7 @@ where id = #{id,jdbcType=BIGINT} - + update jsh_account set name = #{name,jdbcType=VARCHAR}, serial_no = #{serialNo,jdbcType=VARCHAR}, diff --git a/src/main/resources/mapper_xml/AccountMapperEx.xml b/src/main/resources/mapper_xml/AccountMapperEx.xml index 2e6a02ff..e05605fc 100644 --- a/src/main/resources/mapper_xml/AccountMapperEx.xml +++ b/src/main/resources/mapper_xml/AccountMapperEx.xml @@ -1,11 +1,11 @@ - - + + - + @@ -16,7 +16,7 @@ - select * FROM jsh_account where 1=1 @@ -31,7 +31,7 @@ and ifnull(delete_flag,'0') !='1' - select * FROM jsh_account where 1=1 @@ -74,7 +74,7 @@ and ifnull(delete_flag,'0') !='1' - select dh.number,concat(dh.sub_type,dh.type) as newType, 'bill' as fromType, s.supplier,dh.change_amount,date_format(dh.oper_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList from jsh_depot_head dh left join jsh_supplier s on dh.organ_id = s.id and ifnull(s.delete_flag,'0') !='1' diff --git a/src/main/resources/mapper_xml/DepotHeadMapper.xml b/src/main/resources/mapper_xml/DepotHeadMapper.xml index 6f39ad54..01bed3b5 100644 --- a/src/main/resources/mapper_xml/DepotHeadMapper.xml +++ b/src/main/resources/mapper_xml/DepotHeadMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -99,7 +99,7 @@ discount_last_money, other_money, deposit, status, purchase_status, source, link_number, tenant_id, delete_flag - select distinct @@ -123,13 +123,13 @@ delete from jsh_depot_head where id = #{id,jdbcType=BIGINT} - + delete from jsh_depot_head - + insert into jsh_depot_head (id, type, sub_type, default_number, number, create_time, oper_time, organ_id, creator, @@ -153,7 +153,7 @@ #{source,jdbcType=VARCHAR}, #{linkNumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) - + insert into jsh_depot_head @@ -346,7 +346,7 @@ - select count(*) from jsh_depot_head @@ -490,7 +490,7 @@ - + update jsh_depot_head @@ -586,7 +586,7 @@ where id = #{id,jdbcType=BIGINT} - + update jsh_depot_head set type = #{type,jdbcType=VARCHAR}, sub_type = #{subType,jdbcType=VARCHAR}, diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index f4294529..1c29b3c6 100644 --- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -1,8 +1,8 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -52,7 +52,7 @@ - select jdh.*, s.supplier OrganName, u.username userName, a.name AccountName from (select dh.id from jsh_depot_head dh @@ -254,7 +254,7 @@ and ifnull(dh.delete_Flag,'0') !='1') tb - select jsh_depot_item.header_id, group_concat(concat(jsh_material.name,' ',ifnull(jsh_material.standard,''),' ',ifnull(jsh_material.model,''))) as materialsList from jsh_depot_item left join jsh_material on jsh_depot_item.material_id = jsh_material.Id and ifnull(jsh_material.delete_Flag,'0') !='1' @@ -269,7 +269,7 @@ group by jsh_depot_item.header_id - select header_id, sum(oper_number) materialCount from jsh_depot_item where 1=1 @@ -282,7 +282,7 @@ group by header_id - select dh.number,me.bar_code, m.`name` MName,m.model,m.standard,di.unit_price,di.material_unit as mUnit, di.oper_number,di.all_price, ifnull(di.tax_rate,0) tax_rate, ifnull(di.tax_money,0) tax_money, ifnull(di.tax_last_money,0) tax_last_money, s.supplier SName,d.dName DName, date_format(dh.oper_time, '%Y-%m-%d') OperTime, concat(dh.sub_type,dh.type) as NewType, @@ -404,7 +404,7 @@ ORDER BY oper_time DESC,number desc - select di.material_id, me.bar_code, m.name mName,m.Model,m.standard,mc.name categoryName,concat_ws('', m.unit, u.basic_unit) materialUnit, sum(di.basic_number) numSum, sum(di.all_price) priceSum @@ -525,7 +525,7 @@ group by di.material_id) a - select dh.number,me.bar_code, m.`name` MName,m.model,m.standard,di.unit_price,di.material_unit as mUnit,di.oper_number,di.all_price,SName, d.dName DName, date_format(dh.oper_time, '%Y-%m-%d') OperTime, concat(dh.sub_type,dh.type) as NewType, concat_ws(' ',dh.remark,di.remark) as newRemark from jsh_depot_head dh @@ -629,7 +629,7 @@ ORDER BY oper_time DESC,number desc - select * from (select s.id, s.supplier, s.contacts, s.telephone, s.phone_num, s.email, -- 起始期初金额 @@ -765,7 +765,7 @@ where begin_need+preDebtMoney-preReturnDebtMoney-preBackMoney+debtMoney-returnDebtMoney-backMoney!=0 - select sum(begin_need) begin_need, sum(preDebtMoney) preDebtMoney, sum(preReturnDebtMoney) preReturnDebtMoney, sum(preBackMoney) preBackMoney, sum(debtMoney) debtMoney, sum(returnDebtMoney) returnDebtMoney, sum(backMoney) backMoney from (select s.id, @@ -825,7 +825,7 @@ where begin_need+preDebtMoney-preReturnDebtMoney-preBackMoney+debtMoney-returnDebtMoney-backMoney!=0 - select dh.*, concat(dh.sub_type,dh.type) as depotHeadType, a.name AccountName, s.supplier OrganName, s.contacts, s.telephone, s.address from jsh_depot_head dh @@ -849,9 +849,9 @@ ) - select - + from jsh_depot_head where 1=1 and account_id in ( @@ -861,9 +861,9 @@ ) and ifnull(delete_flag,'0') !='1' - select - + from jsh_depot_head where 1=1 and organ_id in ( @@ -873,9 +873,9 @@ ) and ifnull(delete_flag,'0') !='1' - select - + from jsh_depot_head where 1=1 and creator in ( @@ -960,7 +960,7 @@ and ifnull(di.delete_flag,'0') !='1') tb - select distinct dh.*, s.supplier OrganName, u.username userName from jsh_depot_head dh left join jsh_supplier s on dh.organ_id=s.id and ifnull(s.delete_Flag,'0') !='1' @@ -1063,7 +1063,7 @@ and ifnull(dh.delete_flag,'0') !='1' ) tb - select dh.link_number number, ifnull(sum(dh.deposit),0) finishDeposit from jsh_depot_head dh where 1=1 diff --git a/src/main/resources/mapper_xml/DepotItemMapper.xml b/src/main/resources/mapper_xml/DepotItemMapper.xml index cf0b1fa0..a0741e0c 100644 --- a/src/main/resources/mapper_xml/DepotItemMapper.xml +++ b/src/main/resources/mapper_xml/DepotItemMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -92,7 +92,7 @@ depot_id, another_depot_id, tax_rate, tax_money, tax_last_money, material_type, sn_list, batch_number, expiration_date, link_id, tenant_id, delete_flag - select distinct @@ -116,13 +116,13 @@ delete from jsh_depot_item where id = #{id,jdbcType=BIGINT} - + delete from jsh_depot_item - + insert into jsh_depot_item (id, header_id, material_id, material_extend_id, material_unit, sku, oper_number, basic_number, unit_price, @@ -142,7 +142,7 @@ #{expirationDate,jdbcType=TIMESTAMP}, #{linkId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) - + insert into jsh_depot_item @@ -299,7 +299,7 @@ - select count(*) from jsh_depot_item @@ -419,7 +419,7 @@ - + update jsh_depot_item @@ -497,7 +497,7 @@ where id = #{id,jdbcType=BIGINT} - + update jsh_depot_item set header_id = #{headerId,jdbcType=BIGINT}, material_id = #{materialId,jdbcType=BIGINT}, diff --git a/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/src/main/resources/mapper_xml/DepotItemMapperEx.xml index 1bba4b44..19542b19 100644 --- a/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -1,8 +1,8 @@ - + - + @@ -13,12 +13,12 @@ - + - + @@ -38,7 +38,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -96,12 +96,12 @@ - + - select * FROM jsh_depot_item where 1=1 @@ -141,7 +141,7 @@ and ifnull(delete_flag,'0') !='1' - select tb.* from (select dh.number,me.bar_code,m.name material_name,dh.type,dh.sub_type, case @@ -301,7 +301,7 @@ and ifnull(dh.delete_flag,'0') !='1') tb - select di.*,m.name MName,m.model MModel,m.unit MaterialUnit,m.color MColor,m.standard MStandard,m.mfrs MMfrs,m.weight, m.img_name, m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3,m.enable_serial_number, m.enable_batch_number, dp1.name DepotName,dp2.name AnotherDepotName, me.bar_code barCode, me.purchase_decimal @@ -315,7 +315,7 @@ order by di.id asc - select m.id MId, me.bar_code, m.name MName, m.mfrs MMfrs, m.model MModel, m.standard MStandard, m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3, concat_ws('', m.unit, u.basic_unit) MaterialUnit, m.color MColor, m.unit_id, u.name unit_name, ifnull(me.purchase_decimal,0) purchase_decimal @@ -370,7 +370,7 @@ group by m.id) cc - select m.id MId, me.bar_code, m.name MName, m.mfrs MMfrs, m.model MModel, m.standard MStandard, m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3, concat_ws('', m.unit, u.basic_unit) MaterialUnit, m.color MColor, u.name unit_name @@ -728,7 +728,7 @@ - select dep.id,dep.header_id,dep.material_id,dep.material_unit,dep.oper_number, dep.basic_number,dep.unit_price,dep.tax_unit_price,dep.all_price,dep.remark, @@ -770,9 +770,9 @@ ) - select - + from jsh_depot_item where 1=1 and depot_id in ( @@ -783,9 +783,9 @@ and ifnull(delete_flag,'0') !='1' - select - + from jsh_depot_item where 1=1 and material_id in ( @@ -796,7 +796,7 @@ and ifnull(delete_flag,'0') !='1' - select m.id MId, m.name MName, me.bar_code, m.mfrs MMfrs, m.model MModel, m.standard MStandard,m.color MColor, m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3,d.name depotName, m.unit MaterialUnit, u.basic_unit unit_name,mcs.current_number, @@ -956,7 +956,7 @@ and di.batch_number=#{batchNumber} - select di.* from jsh_depot_head dh left join jsh_depot_item di on dh.id=di.header_id and ifnull(di.delete_flag,'0') !='1' where 1=1 @@ -965,7 +965,7 @@ and dh.type = '入库' - select m.id, m.name, m.standard, m.model, me.id meId,me.commodity_unit commodityUnit, me.purchase_decimal purchaseDecimal, me.wholesale_decimal wholesaleDecimal, me.bar_code mBarCode, me.sku from jsh_material m diff --git a/src/main/resources/mapper_xml/DepotMapper.xml b/src/main/resources/mapper_xml/DepotMapper.xml index 13e53b43..15f0a80e 100644 --- a/src/main/resources/mapper_xml/DepotMapper.xml +++ b/src/main/resources/mapper_xml/DepotMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -78,7 +78,7 @@ id, name, address, warehousing, truckage, type, sort, remark, principal, enabled, tenant_id, delete_Flag, is_default - select distinct @@ -102,13 +102,13 @@ delete from jsh_depot where id = #{id,jdbcType=BIGINT} - + delete from jsh_depot - + insert into jsh_depot (id, name, address, warehousing, truckage, type, sort, remark, principal, @@ -120,7 +120,7 @@ #{enabled,jdbcType=BIT}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}, #{isDefault,jdbcType=BIT}) - + insert into jsh_depot @@ -205,7 +205,7 @@ - select count(*) from jsh_depot @@ -277,7 +277,7 @@ - + update jsh_depot @@ -319,7 +319,7 @@ where id = #{id,jdbcType=BIGINT} - + update jsh_depot set name = #{name,jdbcType=VARCHAR}, address = #{address,jdbcType=VARCHAR}, diff --git a/src/main/resources/mapper_xml/DepotMapperEx.xml b/src/main/resources/mapper_xml/DepotMapperEx.xml index 6da9baad..4e9a5f08 100644 --- a/src/main/resources/mapper_xml/DepotMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotMapperEx.xml @@ -1,11 +1,11 @@ - - + + - select dep.*,usr.username as principalName FROM jsh_depot dep left join jsh_user usr on usr.id=dep.principal and ifnull(usr.status,'0') not in('1','2') diff --git a/src/main/resources/mapper_xml/FunctionMapper.xml b/src/main/resources/mapper_xml/FunctionMapper.xml index 7c121b86..a71ae04a 100644 --- a/src/main/resources/mapper_xml/FunctionMapper.xml +++ b/src/main/resources/mapper_xml/FunctionMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -78,7 +78,7 @@ id, number, name, parent_number, url, component, state, sort, enabled, type, push_btn, icon, delete_flag - select distinct @@ -102,13 +102,13 @@ delete from jsh_function where id = #{id,jdbcType=BIGINT} - + delete from jsh_function - + insert into jsh_function (id, number, name, parent_number, url, component, state, sort, enabled, type, @@ -120,7 +120,7 @@ #{pushBtn,jdbcType=VARCHAR}, #{icon,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR} ) - + insert into jsh_function @@ -205,7 +205,7 @@ - select count(*) from jsh_function @@ -277,7 +277,7 @@ - + update jsh_function @@ -319,7 +319,7 @@ where id = #{id,jdbcType=BIGINT} - + update jsh_function set number = #{number,jdbcType=VARCHAR}, name = #{name,jdbcType=VARCHAR}, diff --git a/src/main/resources/mapper_xml/FunctionMapperEx.xml b/src/main/resources/mapper_xml/FunctionMapperEx.xml index 3baa3b5e..3905776b 100644 --- a/src/main/resources/mapper_xml/FunctionMapperEx.xml +++ b/src/main/resources/mapper_xml/FunctionMapperEx.xml @@ -1,10 +1,10 @@ - - + + - + + + + + + + - + insert into jsh_log (user_id, operation, client_ip, create_time, status, content, tenant_id) diff --git a/src/main/resources/mapper_xml/MaterialAttributeMapper.xml b/src/main/resources/mapper_xml/MaterialAttributeMapper.xml index e518cea6..eee87c23 100644 --- a/src/main/resources/mapper_xml/MaterialAttributeMapper.xml +++ b/src/main/resources/mapper_xml/MaterialAttributeMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -69,7 +69,7 @@ id, attribute_name, attribute_value, tenant_id, delete_flag - select distinct @@ -93,19 +93,19 @@ delete from jsh_material_attribute where id = #{id,jdbcType=BIGINT} - + delete from jsh_material_attribute - + insert into jsh_material_attribute (id, attribute_name, attribute_value, tenant_id, delete_flag) values (#{id,jdbcType=BIGINT}, #{attributeName,jdbcType=VARCHAR}, #{attributeValue,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) - + insert into jsh_material_attribute @@ -142,7 +142,7 @@ - select count(*) from jsh_material_attribute @@ -182,7 +182,7 @@ - + update jsh_material_attribute @@ -200,7 +200,7 @@ where id = #{id,jdbcType=BIGINT} - + update jsh_material_attribute set attribute_name = #{attributeName,jdbcType=VARCHAR}, attribute_value = #{attributeValue,jdbcType=VARCHAR}, diff --git a/src/main/resources/mapper_xml/MaterialAttributeMapperEx.xml b/src/main/resources/mapper_xml/MaterialAttributeMapperEx.xml index 46cf9add..5045bddc 100644 --- a/src/main/resources/mapper_xml/MaterialAttributeMapperEx.xml +++ b/src/main/resources/mapper_xml/MaterialAttributeMapperEx.xml @@ -1,8 +1,8 @@ - + - select * from jsh_material_attribute ma where 1=1 diff --git a/src/main/resources/mapper_xml/MaterialCategoryMapper.xml b/src/main/resources/mapper_xml/MaterialCategoryMapper.xml index 8f0655f8..9c0f4df3 100644 --- a/src/main/resources/mapper_xml/MaterialCategoryMapper.xml +++ b/src/main/resources/mapper_xml/MaterialCategoryMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -76,7 +76,7 @@ id, name, category_level, parent_id, sort, serial_no, remark, create_time, update_time, tenant_id, delete_flag - select distinct @@ -100,13 +100,13 @@ delete from jsh_material_category where id = #{id,jdbcType=BIGINT} - + delete from jsh_material_category - + insert into jsh_material_category (id, name, category_level, parent_id, sort, serial_no, remark, create_time, update_time, @@ -116,7 +116,7 @@ #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) - + insert into jsh_material_category @@ -189,7 +189,7 @@ - select count(*) from jsh_material_category @@ -253,7 +253,7 @@ - + update jsh_material_category @@ -289,7 +289,7 @@ where id = #{id,jdbcType=BIGINT} - + update jsh_material_category set name = #{name,jdbcType=VARCHAR}, category_level = #{categoryLevel,jdbcType=SMALLINT}, diff --git a/src/main/resources/mapper_xml/MaterialCategoryMapperEx.xml b/src/main/resources/mapper_xml/MaterialCategoryMapperEx.xml index 101d056c..4a06a560 100644 --- a/src/main/resources/mapper_xml/MaterialCategoryMapperEx.xml +++ b/src/main/resources/mapper_xml/MaterialCategoryMapperEx.xml @@ -1,7 +1,7 @@ - - select * FROM jsh_material_category where 1=1 @@ -34,25 +34,25 @@ and Id !=1 - + + ofType="com.wansensoft.datasource.vo.TreeNode" select="getNextNodeTree"/> - + + ofType="com.wansensoft.datasource.vo.TreeNode" select="getNextNodeTree"/> - + @@ -83,7 +83,7 @@ order by sort asc - insert into jsh_material_category (name, category_level, parent_id, sort,status,serial_no,remark, @@ -109,9 +109,9 @@ name=#{name},remark=#{remark} where id =#{id} - select - + FROM jsh_material_category where 1=1 and serial_no=#{serialNo} @@ -120,9 +120,9 @@ and ifnull(delete_flag,'0') !='1' - select - + from jsh_material_category where 1=1 and parent_id in ( diff --git a/src/main/resources/mapper_xml/MaterialCurrentStockMapper.xml b/src/main/resources/mapper_xml/MaterialCurrentStockMapper.xml index b2abdaf0..240e335a 100644 --- a/src/main/resources/mapper_xml/MaterialCurrentStockMapper.xml +++ b/src/main/resources/mapper_xml/MaterialCurrentStockMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -70,7 +70,7 @@ id, material_id, depot_id, current_number, tenant_id, delete_flag - select distinct @@ -94,13 +94,13 @@ delete from jsh_material_current_stock where id = #{id,jdbcType=BIGINT} - + delete from jsh_material_current_stock - + insert into jsh_material_current_stock (id, material_id, depot_id, current_number, tenant_id, delete_flag ) @@ -108,7 +108,7 @@ #{currentNumber,jdbcType=DECIMAL}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR} ) - + insert into jsh_material_current_stock @@ -151,7 +151,7 @@ - select count(*) from jsh_material_current_stock @@ -195,7 +195,7 @@ - + update jsh_material_current_stock @@ -216,7 +216,7 @@ where id = #{id,jdbcType=BIGINT} - + update jsh_material_current_stock set material_id = #{materialId,jdbcType=BIGINT}, depot_id = #{depotId,jdbcType=BIGINT}, diff --git a/src/main/resources/mapper_xml/MaterialCurrentStockMapperEx.xml b/src/main/resources/mapper_xml/MaterialCurrentStockMapperEx.xml index 216c0dfb..28062304 100644 --- a/src/main/resources/mapper_xml/MaterialCurrentStockMapperEx.xml +++ b/src/main/resources/mapper_xml/MaterialCurrentStockMapperEx.xml @@ -1,6 +1,6 @@ - + insert into jsh_material_current_stock (material_id, depot_id, current_number) @@ -10,7 +10,7 @@ - select material_id, sum(current_number) current_number from jsh_material_current_stock where 1=1 and ifnull(delete_flag,'0') !='1' diff --git a/src/main/resources/mapper_xml/MaterialExtendMapper.xml b/src/main/resources/mapper_xml/MaterialExtendMapper.xml index 9115135c..771ff604 100644 --- a/src/main/resources/mapper_xml/MaterialExtendMapper.xml +++ b/src/main/resources/mapper_xml/MaterialExtendMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -82,7 +82,7 @@ wholesale_decimal, low_decimal, default_flag, create_time, create_serial, update_serial, update_time, tenant_id, delete_Flag - select distinct @@ -106,13 +106,13 @@ delete from jsh_material_extend where id = #{id,jdbcType=BIGINT} - + delete from jsh_material_extend - + insert into jsh_material_extend (id, material_id, bar_code, commodity_unit, sku, purchase_decimal, commodity_decimal, wholesale_decimal, low_decimal, @@ -126,7 +126,7 @@ #{updateSerial,jdbcType=VARCHAR}, #{updateTime,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) - + insert into jsh_material_extend @@ -229,7 +229,7 @@ - select count(*) from jsh_material_extend @@ -313,7 +313,7 @@ - + update jsh_material_extend @@ -364,7 +364,7 @@ where id = #{id,jdbcType=BIGINT} - + update jsh_material_extend set material_id = #{materialId,jdbcType=BIGINT}, bar_code = #{barCode,jdbcType=VARCHAR}, diff --git a/src/main/resources/mapper_xml/MaterialExtendMapperEx.xml b/src/main/resources/mapper_xml/MaterialExtendMapperEx.xml index a52101fb..d9785aa5 100644 --- a/src/main/resources/mapper_xml/MaterialExtendMapperEx.xml +++ b/src/main/resources/mapper_xml/MaterialExtendMapperEx.xml @@ -1,11 +1,11 @@ - - + + - select DISTINCT d.Id,d.bar_code,d.commodity_unit,d.sku,d.commodity_decimal,d.purchase_decimal,d.wholesale_decimal,d.low_decimal from jsh_material_extend d where d.material_id = #{materialId} @@ -28,9 +28,9 @@ ) time_list - select - + from jsh_material_extend where 1=1 and ifnull(delete_Flag,'0') !='1' @@ -66,7 +66,7 @@ ) - + update jsh_material_extend set purchase_decimal = #{purchaseDecimal,jdbcType=DECIMAL}, commodity_decimal = #{commodityDecimal,jdbcType=DECIMAL}, diff --git a/src/main/resources/mapper_xml/MaterialInitialStockMapper.xml b/src/main/resources/mapper_xml/MaterialInitialStockMapper.xml index 61f5bcca..a05de9f3 100644 --- a/src/main/resources/mapper_xml/MaterialInitialStockMapper.xml +++ b/src/main/resources/mapper_xml/MaterialInitialStockMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -72,7 +72,7 @@ id, material_id, depot_id, number, low_safe_stock, high_safe_stock, tenant_id, delete_flag - select distinct @@ -96,13 +96,13 @@ delete from jsh_material_initial_stock where id = #{id,jdbcType=BIGINT} - + delete from jsh_material_initial_stock - + insert into jsh_material_initial_stock (id, material_id, depot_id, number, low_safe_stock, high_safe_stock, tenant_id, delete_flag) @@ -110,7 +110,7 @@ #{number,jdbcType=DECIMAL}, #{lowSafeStock,jdbcType=DECIMAL}, #{highSafeStock,jdbcType=DECIMAL}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) - + insert into jsh_material_initial_stock @@ -165,7 +165,7 @@ - select count(*) from jsh_material_initial_stock @@ -217,7 +217,7 @@ - + update jsh_material_initial_stock @@ -244,7 +244,7 @@ where id = #{id,jdbcType=BIGINT} - + update jsh_material_initial_stock set material_id = #{materialId,jdbcType=BIGINT}, depot_id = #{depotId,jdbcType=BIGINT}, diff --git a/src/main/resources/mapper_xml/MaterialInitialStockMapperEx.xml b/src/main/resources/mapper_xml/MaterialInitialStockMapperEx.xml index 756dc498..59a01e39 100644 --- a/src/main/resources/mapper_xml/MaterialInitialStockMapperEx.xml +++ b/src/main/resources/mapper_xml/MaterialInitialStockMapperEx.xml @@ -1,6 +1,6 @@ - + insert into jsh_material_initial_stock (material_id, depot_id, number) @@ -10,7 +10,7 @@ - select * from jsh_material_initial_stock where number!=0 and ifnull(delete_flag,'0') !='1' diff --git a/src/main/resources/mapper_xml/MaterialMapper.xml b/src/main/resources/mapper_xml/MaterialMapper.xml index 494d5232..d47bdd57 100644 --- a/src/main/resources/mapper_xml/MaterialMapper.xml +++ b/src/main/resources/mapper_xml/MaterialMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -88,7 +88,7 @@ expiry_num, weight, enabled, other_field1, other_field2, other_field3, enable_serial_number, enable_batch_number, position, tenant_id, delete_flag - select distinct @@ -112,13 +112,13 @@ delete from jsh_material where id = #{id,jdbcType=BIGINT} - + delete from jsh_material - + insert into jsh_material (id, category_id, name, mfrs, model, standard, color, unit, remark, @@ -136,7 +136,7 @@ #{enableBatchNumber,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) - + insert into jsh_material @@ -275,7 +275,7 @@ - select count(*) from jsh_material @@ -383,7 +383,7 @@ - + update jsh_material @@ -452,7 +452,7 @@ where id = #{id,jdbcType=BIGINT} - + update jsh_material set category_id = #{categoryId,jdbcType=BIGINT}, name = #{name,jdbcType=VARCHAR}, diff --git a/src/main/resources/mapper_xml/MaterialMapperEx.xml b/src/main/resources/mapper_xml/MaterialMapperEx.xml index 3f5df002..29dcc477 100644 --- a/src/main/resources/mapper_xml/MaterialMapperEx.xml +++ b/src/main/resources/mapper_xml/MaterialMapperEx.xml @@ -1,7 +1,7 @@ - - + + @@ -14,7 +14,7 @@ - + @@ -26,18 +26,18 @@ - + - + - select m.*,u.name unitName, mc.name categoryName, me.bar_code, me.purchase_decimal, me.commodity_decimal, me.wholesale_decimal,me.low_decimal,me.sku FROM jsh_material m @@ -149,7 +149,7 @@ and ifnull(m.delete_flag,'0') !='1' - + insert into jsh_material @@ -289,21 +289,21 @@ - select u.* from jsh_unit u left join jsh_material m on m.unit_id=u.id and ifnull(m.delete_flag,'0') !='1' where m.id = #{mId} and ifnull(u.delete_flag,'0') !='1' - select m.*,u.name unit_name from jsh_material m left join jsh_unit u on m.unit_id=u.id and ifnull(u.delete_flag,'0') !='1' where m.id = #{id} and ifnull(m.delete_flag,'0') !='1' - select m.*,u.name unit_name,me.bar_code m_bar_code, me.commodity_unit, me.purchase_decimal, me.commodity_decimal, me.wholesale_decimal, me.low_decimal from jsh_material m @@ -313,7 +313,7 @@ and ifnull(m.delete_flag,'0') !='1' - select me.bar_code, m.name, m.standard, m.model, m.color, me.commodity_unit unit from jsh_material m left join jsh_material_extend me on m.id = me.material_id and ifnull(me.delete_Flag,'0') !='1' @@ -327,7 +327,7 @@ limit 0,20 - select m.*,u.name unit_name,mc.name categoryName,me.bar_code m_bar_code,me.id meId,me.commodity_unit,me.sku from jsh_material m left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1' left join jsh_unit u on m.unit_id=u.id and ifnull(u.delete_Flag,'0') !='1' @@ -380,7 +380,7 @@ and ifnull(m.delete_flag,'0') !='1' - select m.*,u.name unitName, u.ratio, mc.name categoryName,me.bar_code,me.commodity_unit,me.purchase_decimal, me.commodity_decimal, me.wholesale_decimal, me.low_decimal, me.sku from jsh_material m @@ -431,14 +431,14 @@ order by m.id desc, me.default_flag desc, me.id asc - select me.material_id, me.bar_code, me.commodity_unit from jsh_material_extend me where me.default_flag=0 and (me.sku='' or me.sku is null) and ifnull(me.delete_Flag,'0') !='1' group by me.material_id - select m.* FROM jsh_material m where 1=1 @@ -489,9 +489,9 @@ ) - select - + from jsh_material where 1=1 and category_id in ( @@ -501,9 +501,9 @@ ) and ifnull(delete_flag,'0') !='1' - select - + from jsh_material where 1=1 and unit_id in ( @@ -520,7 +520,7 @@ and ifnull(me.delete_Flag,'0') !='1' - select m.*,me.bar_code,u.name unitName, mc.name categoryName FROM jsh_material m left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1' @@ -540,7 +540,7 @@ order by m.name asc - select m.*,u.name unit_name, me.id meId,me.bar_code m_bar_code, me.commodity_unit, me.purchase_decimal, me.commodity_decimal, me.wholesale_decimal, me.low_decimal, me.sku from jsh_material m @@ -556,7 +556,7 @@ order by m.id desc, me.default_flag desc, me.id asc - select m.*,u.name unit_name, me.id meId,me.bar_code m_bar_code, me.commodity_unit, me.purchase_decimal, me.commodity_decimal, me.wholesale_decimal, me.low_decimal, me.sku from jsh_material m @@ -688,7 +688,7 @@ ) tb - select ifnull(sum(mcs.current_number),0) currentStock, sum(ifnull(me.purchase_decimal,0)*ifnull(mcs.current_number,0)) currentStockPrice, @@ -761,7 +761,7 @@ - select me.bar_code from jsh_material m left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_flag,'0') !='1' diff --git a/src/main/resources/mapper_xml/MaterialPropertyMapper.xml b/src/main/resources/mapper_xml/MaterialPropertyMapper.xml index 8e047708..78a49a7a 100644 --- a/src/main/resources/mapper_xml/MaterialPropertyMapper.xml +++ b/src/main/resources/mapper_xml/MaterialPropertyMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -70,7 +70,7 @@ id, native_name, enabled, sort, another_name, delete_flag - select distinct @@ -94,13 +94,13 @@ delete from jsh_material_property where id = #{id,jdbcType=BIGINT} - + delete from jsh_material_property - + insert into jsh_material_property (id, native_name, enabled, sort, another_name, delete_flag ) @@ -108,7 +108,7 @@ #{sort,jdbcType=VARCHAR}, #{anotherName,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR} ) - + insert into jsh_material_property @@ -151,7 +151,7 @@ - select count(*) from jsh_material_property @@ -195,7 +195,7 @@ - + update jsh_material_property @@ -216,7 +216,7 @@ where id = #{id,jdbcType=BIGINT} - + update jsh_material_property set native_name = #{nativeName,jdbcType=VARCHAR}, enabled = #{enabled,jdbcType=BIT}, diff --git a/src/main/resources/mapper_xml/MaterialPropertyMapperEx.xml b/src/main/resources/mapper_xml/MaterialPropertyMapperEx.xml index 63179b62..904aefa1 100644 --- a/src/main/resources/mapper_xml/MaterialPropertyMapperEx.xml +++ b/src/main/resources/mapper_xml/MaterialPropertyMapperEx.xml @@ -1,7 +1,7 @@ - - select * FROM jsh_material_property where 1=1 diff --git a/src/main/resources/mapper_xml/MsgMapper.xml b/src/main/resources/mapper_xml/MsgMapper.xml index 83897ea7..10da3c6d 100644 --- a/src/main/resources/mapper_xml/MsgMapper.xml +++ b/src/main/resources/mapper_xml/MsgMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -73,7 +73,7 @@ id, msg_title, msg_content, create_time, type, user_id, status, tenant_id, delete_Flag - select distinct @@ -97,13 +97,13 @@ delete from jsh_msg where id = #{id,jdbcType=BIGINT} - + delete from jsh_msg - + insert into jsh_msg (id, msg_title, msg_content, create_time, type, user_id, status, tenant_id, delete_Flag @@ -113,7 +113,7 @@ #{status,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR} ) - + insert into jsh_msg @@ -174,7 +174,7 @@ - select count(*) from jsh_msg @@ -230,7 +230,7 @@ - + update jsh_msg @@ -260,7 +260,7 @@ where id = #{id,jdbcType=BIGINT} - + update jsh_msg set msg_title = #{msgTitle,jdbcType=VARCHAR}, msg_content = #{msgContent,jdbcType=VARCHAR}, diff --git a/src/main/resources/mapper_xml/MsgMapperEx.xml b/src/main/resources/mapper_xml/MsgMapperEx.xml index dbe22ae9..72f86881 100644 --- a/src/main/resources/mapper_xml/MsgMapperEx.xml +++ b/src/main/resources/mapper_xml/MsgMapperEx.xml @@ -1,9 +1,9 @@ - - + + - SELECT * FROM jsh_msg WHERE 1=1 diff --git a/src/main/resources/mapper_xml/OrgaUserRelMapper.xml b/src/main/resources/mapper_xml/OrgaUserRelMapper.xml index abbf5d61..e2c377e9 100644 --- a/src/main/resources/mapper_xml/OrgaUserRelMapper.xml +++ b/src/main/resources/mapper_xml/OrgaUserRelMapper.xml @@ -1,7 +1,7 @@ - - + +