diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicAreaServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicAreaServiceImpl.java index ef3e899..9663c34 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicAreaServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicAreaServiceImpl.java @@ -7,7 +7,7 @@ import java.util.Objects; import java.util.stream.Collectors; import com.bonus.canteen.core.basic.mapper.BasicCanteenMapper; import com.bonus.canteen.core.common.domain.TreeSelect; -import com.bonus.canteen.core.iws.mapper.ImsWarehouseInfoMapper; +import com.bonus.canteen.core.ims.mapper.ImsWarehouseInfoMapper; import com.bonus.canteen.core.supermarket.mapper.SupermarketInfoMapper; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/controller/ImsUnitController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsUnitController.java similarity index 95% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/controller/ImsUnitController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsUnitController.java index aa6c690..42571da 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/controller/ImsUnitController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsUnitController.java @@ -1,9 +1,9 @@ -package com.bonus.canteen.core.iws.controller; +package com.bonus.canteen.core.ims.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; import com.bonus.common.log.enums.OperaType; -//import com.bonus.canteen.core.iws.common.annotation.PreventRepeatSubmit; +//import com.bonus.canteen.core.ims.common.annotation.PreventRepeatSubmit; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.security.annotation.RequiresPermissions; -import com.bonus.canteen.core.iws.domain.ImsUnit; -import com.bonus.canteen.core.iws.service.IImsUnitService; +import com.bonus.canteen.core.ims.domain.ImsUnit; +import com.bonus.canteen.core.ims.service.IImsUnitService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.utils.poi.ExcelUtil; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/controller/ImsWarehouseInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsWarehouseInfoController.java similarity index 95% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/controller/ImsWarehouseInfoController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsWarehouseInfoController.java index 90516a1..7b787bf 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/controller/ImsWarehouseInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsWarehouseInfoController.java @@ -1,9 +1,9 @@ -package com.bonus.canteen.core.iws.controller; +package com.bonus.canteen.core.ims.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; import com.bonus.common.log.enums.OperaType; -//import com.bonus.canteen.core.iws.common.annotation.PreventRepeatSubmit; +//import com.bonus.canteen.core.ims.common.annotation.PreventRepeatSubmit; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.security.annotation.RequiresPermissions; -import com.bonus.canteen.core.iws.domain.ImsWarehouseInfo; -import com.bonus.canteen.core.iws.service.IImsWarehouseInfoService; +import com.bonus.canteen.core.ims.domain.ImsWarehouseInfo; +import com.bonus.canteen.core.ims.service.IImsWarehouseInfoService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.utils.poi.ExcelUtil; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/domain/ImsUnit.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsUnit.java similarity index 95% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/domain/ImsUnit.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsUnit.java index d737c70..22ae45c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/domain/ImsUnit.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsUnit.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.iws.domain; +package com.bonus.canteen.core.ims.domain; import java.math.BigDecimal; import com.bonus.common.core.annotation.Excel; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/domain/ImsWarehouseInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsWarehouseInfo.java similarity index 98% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/domain/ImsWarehouseInfo.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsWarehouseInfo.java index b9cce73..ffe5136 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/domain/ImsWarehouseInfo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsWarehouseInfo.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.iws.domain; +package com.bonus.canteen.core.ims.domain; import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/mapper/ImsUnitMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsUnitMapper.java similarity index 92% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/mapper/ImsUnitMapper.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsUnitMapper.java index 3494c92..7b40344 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/mapper/ImsUnitMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsUnitMapper.java @@ -1,7 +1,7 @@ -package com.bonus.canteen.core.iws.mapper; +package com.bonus.canteen.core.ims.mapper; import java.util.List; -import com.bonus.canteen.core.iws.domain.ImsUnit; +import com.bonus.canteen.core.ims.domain.ImsUnit; /** * 计量单位Mapper接口 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/mapper/ImsWarehouseInfoMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsWarehouseInfoMapper.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/mapper/ImsWarehouseInfoMapper.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsWarehouseInfoMapper.java index 029961b..aa4a5bf 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/mapper/ImsWarehouseInfoMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsWarehouseInfoMapper.java @@ -1,7 +1,7 @@ -package com.bonus.canteen.core.iws.mapper; +package com.bonus.canteen.core.ims.mapper; import java.util.List; -import com.bonus.canteen.core.iws.domain.ImsWarehouseInfo; +import com.bonus.canteen.core.ims.domain.ImsWarehouseInfo; /** * 仓库信息Mapper接口 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/service/IImsUnitService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IImsUnitService.java similarity index 92% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/service/IImsUnitService.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IImsUnitService.java index 8fd18fa..beaf184 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/service/IImsUnitService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IImsUnitService.java @@ -1,7 +1,7 @@ -package com.bonus.canteen.core.iws.service; +package com.bonus.canteen.core.ims.service; import java.util.List; -import com.bonus.canteen.core.iws.domain.ImsUnit; +import com.bonus.canteen.core.ims.domain.ImsUnit; /** * 计量单位Service接口 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/service/IImsWarehouseInfoService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IImsWarehouseInfoService.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/service/IImsWarehouseInfoService.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IImsWarehouseInfoService.java index 6117d37..4709f13 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/service/IImsWarehouseInfoService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IImsWarehouseInfoService.java @@ -1,7 +1,7 @@ -package com.bonus.canteen.core.iws.service; +package com.bonus.canteen.core.ims.service; import java.util.List; -import com.bonus.canteen.core.iws.domain.ImsWarehouseInfo; +import com.bonus.canteen.core.ims.domain.ImsWarehouseInfo; /** * 仓库信息Service接口 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/service/impl/ImsUnitServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsUnitServiceImpl.java similarity index 91% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/service/impl/ImsUnitServiceImpl.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsUnitServiceImpl.java index a504aa4..cb5d5d9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/service/impl/ImsUnitServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsUnitServiceImpl.java @@ -1,13 +1,13 @@ -package com.bonus.canteen.core.iws.service.impl; +package com.bonus.canteen.core.ims.service.impl; import java.util.List; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.bonus.canteen.core.iws.mapper.ImsUnitMapper; -import com.bonus.canteen.core.iws.domain.ImsUnit; -import com.bonus.canteen.core.iws.service.IImsUnitService; +import com.bonus.canteen.core.ims.mapper.ImsUnitMapper; +import com.bonus.canteen.core.ims.domain.ImsUnit; +import com.bonus.canteen.core.ims.service.IImsUnitService; /** * 计量单位Service业务层处理 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/service/impl/ImsWarehouseInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsWarehouseInfoServiceImpl.java similarity index 92% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/service/impl/ImsWarehouseInfoServiceImpl.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsWarehouseInfoServiceImpl.java index 34997f9..1d8e05d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/iws/service/impl/ImsWarehouseInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsWarehouseInfoServiceImpl.java @@ -1,13 +1,13 @@ -package com.bonus.canteen.core.iws.service.impl; +package com.bonus.canteen.core.ims.service.impl; import java.util.List; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.bonus.canteen.core.iws.mapper.ImsWarehouseInfoMapper; -import com.bonus.canteen.core.iws.domain.ImsWarehouseInfo; -import com.bonus.canteen.core.iws.service.IImsWarehouseInfoService; +import com.bonus.canteen.core.ims.mapper.ImsWarehouseInfoMapper; +import com.bonus.canteen.core.ims.domain.ImsWarehouseInfo; +import com.bonus.canteen.core.ims.service.IImsWarehouseInfoService; /** * 仓库信息Service业务层处理 diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/iws/ImsUnitMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsUnitMapper.xml similarity index 92% rename from bonus-modules/bonus-smart-canteen/src/main/resources/mapper/iws/ImsUnitMapper.xml rename to bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsUnitMapper.xml index 9f1b998..415a131 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/iws/ImsUnitMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsUnitMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select unit_id, unit_name, rate, weigh_type, create_by, create_time, update_by, update_time from ims_unit - and unit_name like concat('%', #{unitName}, '%') @@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where unit_id = #{unitId} - + insert into ims_unit unit_name, @@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update ims_unit unit_name = #{unitName}, diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/iws/ImsWarehouseInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsWarehouseInfoMapper.xml similarity index 96% rename from bonus-modules/bonus-smart-canteen/src/main/resources/mapper/iws/ImsWarehouseInfoMapper.xml rename to bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsWarehouseInfoMapper.xml index 585dd46..14d0f0f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/iws/ImsWarehouseInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsWarehouseInfoMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select warehouse_id, parent_id, category_id, area_id, canteen_id, warehouse_code, warehouse_name, user_id, manager, fetch_user_id, region_province, region_city, region_district, address, warehouse_type, if_use_warehouse_area, if_use_warehouse_location, del_flag, create_by, create_time, update_by, update_time from ims_warehouse_info - and parent_id = #{parentId} @@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into ims_warehouse_info parent_id, @@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update ims_warehouse_info parent_id = #{parentId},