diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockOutController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockOutController.java index 6482475d..d4291985 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockOutController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockOutController.java @@ -7,7 +7,7 @@ import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.module.stock.domain.ErpStockOut; import cn.qihangerp.module.stock.request.StockOutCreateRequest; import cn.qihangerp.module.stock.request.StockOutItemRequest; -import cn.qihangerp.module.stock.service.WmsStockOutService; +import cn.qihangerp.module.stock.service.ErpStockOutService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/stockOut") public class StockOutController extends BaseController { - private final WmsStockOutService stockOutService; + private final ErpStockOutService stockOutService; @GetMapping("/list") public TableDataInfo list(ErpStockOut bo, PageQuery pageQuery) diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/WarehouseController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/WarehouseController.java index 62d7ec09..a8cfe78c 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/WarehouseController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/WarehouseController.java @@ -3,10 +3,10 @@ package cn.qihangerp.oms.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.module.stock.domain.WmsWarehouse; -import cn.qihangerp.module.stock.domain.WmsWarehousePosition; -import cn.qihangerp.module.stock.service.WmsWarehousePositionService; -import cn.qihangerp.module.stock.service.WmsWarehouseService; +import cn.qihangerp.module.stock.domain.ErpWarehouse; +import cn.qihangerp.module.stock.domain.ErpWarehousePosition; +import cn.qihangerp.module.stock.service.ErpWarehousePositionService; +import cn.qihangerp.module.stock.service.ErpWarehouseService; import cn.qihangerp.security.common.BaseController; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.AllArgsConstructor; @@ -21,18 +21,18 @@ import java.util.List; @RestController @RequestMapping("/warehouse") public class WarehouseController extends BaseController { - private final WmsWarehouseService warehouseService; - private final WmsWarehousePositionService positionService; + private final ErpWarehouseService warehouseService; + private final ErpWarehousePositionService positionService; @GetMapping("/list") - public TableDataInfo list(WmsWarehouse bo) + public TableDataInfo list(ErpWarehouse bo) { - LambdaQueryWrapper qw = new LambdaQueryWrapper() - .eq(bo.getStatus()!=null,WmsWarehouse::getStatus, bo.getStatus()) - .like(StringUtils.hasText(bo.getNumber()),WmsWarehouse::getNumber,bo.getNumber()) - .like(StringUtils.hasText(bo.getName()),WmsWarehouse::getName,bo.getName()) + LambdaQueryWrapper qw = new LambdaQueryWrapper() + .eq(bo.getStatus()!=null, ErpWarehouse::getStatus, bo.getStatus()) + .like(StringUtils.hasText(bo.getNumber()), ErpWarehouse::getNumber,bo.getNumber()) + .like(StringUtils.hasText(bo.getName()), ErpWarehouse::getName,bo.getName()) ; - List wmsWarehouses = warehouseService.list(qw); - return getDataTable(wmsWarehouses); + List erpWarehouses = warehouseService.list(qw); + return getDataTable(erpWarehouses); } @GetMapping(value = "/{id}") @@ -41,13 +41,13 @@ public class WarehouseController extends BaseController { return success(warehouseService.getById(id)); } @PostMapping - public AjaxResult add(@RequestBody WmsWarehouse warehouse) + public AjaxResult add(@RequestBody ErpWarehouse warehouse) { warehouse.setCreateBy(getUsername()); warehouse.setCreateTime(new Date()); boolean save = warehouseService.save(warehouse); if(save){ - WmsWarehousePosition position = new WmsWarehousePosition(); + ErpWarehousePosition position = new ErpWarehousePosition(); position.setWarehouseId(warehouse.getId()); position.setParentId(0); position.setParentId1(0); @@ -64,7 +64,7 @@ public class WarehouseController extends BaseController { return AjaxResult.success(); } @PutMapping - public AjaxResult edit(@RequestBody WmsWarehouse warehouse) + public AjaxResult edit(@RequestBody ErpWarehouse warehouse) { warehouse.setUpdateBy(getUsername()); warehouse.setUpdateTime(new Date()); @@ -79,26 +79,26 @@ public class WarehouseController extends BaseController { @GetMapping("/position/list") public TableDataInfo positionList(Long warehouseId) { - LambdaQueryWrapper qw = new LambdaQueryWrapper() - .eq(WmsWarehousePosition::getWarehouseId,warehouseId) + LambdaQueryWrapper qw = new LambdaQueryWrapper() + .eq(ErpWarehousePosition::getWarehouseId,warehouseId) ; - List list = positionService.list(qw); + List list = positionService.list(qw); return getDataTable(list); } @GetMapping("/position/search") public TableDataInfo searchPosition(Long warehouseId,String number) { - LambdaQueryWrapper qw = new LambdaQueryWrapper() - .eq(WmsWarehousePosition::getWarehouseId,warehouseId) - .like(WmsWarehousePosition::getNumber,number) + LambdaQueryWrapper qw = new LambdaQueryWrapper() + .eq(ErpWarehousePosition::getWarehouseId,warehouseId) + .like(ErpWarehousePosition::getNumber,number) ; - List list = positionService.list(qw); + List list = positionService.list(qw); return getDataTable(list); } @PostMapping("/position") - public AjaxResult positionAdd(@RequestBody WmsWarehousePosition position) { + public AjaxResult positionAdd(@RequestBody ErpWarehousePosition position) { position.setCreateBy(getUsername()); position.setCreateTime(new Date()); position.setParentId1(0); @@ -115,7 +115,7 @@ public class WarehouseController extends BaseController { } @PutMapping("/position") - public AjaxResult positionEdit(@RequestBody WmsWarehousePosition position) + public AjaxResult positionEdit(@RequestBody ErpWarehousePosition position) { position.setUpdateBy(getUsername()); position.setUpdateTime(new Date()); diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/domain/WmsWarehouse.java b/module/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpWarehouse.java similarity index 95% rename from module/stock/src/main/java/cn/qihangerp/module/stock/domain/WmsWarehouse.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpWarehouse.java index 51ddb3d9..747e3376 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/domain/WmsWarehouse.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpWarehouse.java @@ -12,7 +12,7 @@ import lombok.Data; * @TableName wms_warehouse */ @Data -public class WmsWarehouse implements Serializable { +public class ErpWarehouse implements Serializable { /** * */ diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/domain/WmsWarehousePosition.java b/module/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpWarehousePosition.java similarity index 95% rename from module/stock/src/main/java/cn/qihangerp/module/stock/domain/WmsWarehousePosition.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpWarehousePosition.java index ee7b6654..f849bd4c 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/domain/WmsWarehousePosition.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpWarehousePosition.java @@ -12,7 +12,7 @@ import lombok.Data; * @TableName wms_warehouse_position */ @Data -public class WmsWarehousePosition implements Serializable { +public class ErpWarehousePosition implements Serializable { /** * */ diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsStockOutItemMapper.java b/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockOutItemMapper.java similarity index 85% rename from module/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsStockOutItemMapper.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockOutItemMapper.java index 1d5ef57b..140ddf05 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsStockOutItemMapper.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockOutItemMapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @createDate 2024-09-22 11:13:23 * @Entity cn.qihangerp.wms.domain.WmsStockOutItem */ -public interface WmsStockOutItemMapper extends BaseMapper { +public interface ErpStockOutItemMapper extends BaseMapper { } diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsStockOutItemPositionMapper.java b/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockOutItemPositionMapper.java similarity index 86% rename from module/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsStockOutItemPositionMapper.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockOutItemPositionMapper.java index 1f153faa..af45c12c 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsStockOutItemPositionMapper.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockOutItemPositionMapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @createDate 2024-09-22 11:13:23 * @Entity cn.qihangerp.wms.domain.WmsStockOutItemPosition */ -public interface WmsStockOutItemPositionMapper extends BaseMapper { +public interface ErpStockOutItemPositionMapper extends BaseMapper { } diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsStockOutMapper.java b/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockOutMapper.java similarity index 84% rename from module/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsStockOutMapper.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockOutMapper.java index 52f8ea05..0e80fa0d 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsStockOutMapper.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockOutMapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @createDate 2024-09-22 11:13:23 * @Entity cn.qihangerp.wms.domain.WmsStockOut */ -public interface WmsStockOutMapper extends BaseMapper { +public interface ErpStockOutMapper extends BaseMapper { } diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsWarehouseMapper.java b/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehouseMapper.java similarity index 71% rename from module/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsWarehouseMapper.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehouseMapper.java index eadd9338..bcc300b5 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsWarehouseMapper.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehouseMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.stock.mapper; -import cn.qihangerp.module.stock.domain.WmsWarehouse; +import cn.qihangerp.module.stock.domain.ErpWarehouse; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @createDate 2024-09-22 11:13:23 * @Entity cn.qihangerp.wms.domain.WmsWarehouse */ -public interface WmsWarehouseMapper extends BaseMapper { +public interface ErpWarehouseMapper extends BaseMapper { } diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsWarehousePositionMapper.java b/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehousePositionMapper.java similarity index 67% rename from module/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsWarehousePositionMapper.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehousePositionMapper.java index 3d768d7b..10934dd7 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsWarehousePositionMapper.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehousePositionMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.stock.mapper; -import cn.qihangerp.module.stock.domain.WmsWarehousePosition; +import cn.qihangerp.module.stock.domain.ErpWarehousePosition; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @createDate 2024-09-22 11:13:23 * @Entity cn.qihangerp.wms.domain.WmsWarehousePosition */ -public interface WmsWarehousePositionMapper extends BaseMapper { +public interface ErpWarehousePositionMapper extends BaseMapper { } diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsInventoryOperationService.java b/module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpInventoryOperationService.java similarity index 84% rename from module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsInventoryOperationService.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpInventoryOperationService.java index 9c9f15a6..2fe7e21d 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsInventoryOperationService.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpInventoryOperationService.java @@ -8,6 +8,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @description 针对表【wms_inventory_operation(仓库库存操作记录表)】的数据库操作Service * @createDate 2024-09-23 22:35:19 */ -public interface WmsInventoryOperationService extends IService { +public interface ErpInventoryOperationService extends IService { } diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsStockOutItemPositionService.java b/module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutItemPositionService.java similarity index 84% rename from module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsStockOutItemPositionService.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutItemPositionService.java index c9410a8d..6e0d790b 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsStockOutItemPositionService.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutItemPositionService.java @@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @description 针对表【wms_stock_out_item_position(出库仓位详情)】的数据库操作Service * @createDate 2024-09-22 11:13:23 */ -public interface WmsStockOutItemPositionService extends IService { +public interface ErpStockOutItemPositionService extends IService { } diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsStockOutItemService.java b/module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutItemService.java similarity index 83% rename from module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsStockOutItemService.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutItemService.java index c3d4a543..58a3add7 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsStockOutItemService.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutItemService.java @@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @description 针对表【wms_stock_out_item(出库单明细)】的数据库操作Service * @createDate 2024-09-22 11:13:23 */ -public interface WmsStockOutItemService extends IService { +public interface ErpStockOutItemService extends IService { } diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsStockOutService.java b/module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutService.java similarity index 93% rename from module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsStockOutService.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutService.java index 25bc1cce..25a3aabb 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsStockOutService.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutService.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * @description 针对表【wms_stock_out(出库单)】的数据库操作Service * @createDate 2024-09-22 11:13:23 */ -public interface WmsStockOutService extends IService { +public interface ErpStockOutService extends IService { PageResult queryPageList(ErpStockOut bo, PageQuery pageQuery); ResultVo createEntry(Long userId, String userName, StockOutCreateRequest request); diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsWarehousePositionService.java b/module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehousePositionService.java similarity index 63% rename from module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsWarehousePositionService.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehousePositionService.java index 8fb46ca1..0b60a709 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsWarehousePositionService.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehousePositionService.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.stock.service; -import cn.qihangerp.module.stock.domain.WmsWarehousePosition; +import cn.qihangerp.module.stock.domain.ErpWarehousePosition; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @description 针对表【wms_warehouse_position(仓库仓位表)】的数据库操作Service * @createDate 2024-09-22 11:13:23 */ -public interface WmsWarehousePositionService extends IService { +public interface ErpWarehousePositionService extends IService { } diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsWarehouseService.java b/module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehouseService.java similarity index 68% rename from module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsWarehouseService.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehouseService.java index f01c1f8e..8446ac75 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/service/WmsWarehouseService.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehouseService.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.stock.service; -import cn.qihangerp.module.stock.domain.WmsWarehouse; +import cn.qihangerp.module.stock.domain.ErpWarehouse; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @description 针对表【wms_warehouse(仓库表)】的数据库操作Service * @createDate 2024-09-22 11:13:23 */ -public interface WmsWarehouseService extends IService { +public interface ErpWarehouseService extends IService { } diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsInventoryOperationServiceImpl.java b/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpInventoryOperationServiceImpl.java similarity index 75% rename from module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsInventoryOperationServiceImpl.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpInventoryOperationServiceImpl.java index e5b0a4ec..7b1af12f 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsInventoryOperationServiceImpl.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpInventoryOperationServiceImpl.java @@ -2,7 +2,7 @@ package cn.qihangerp.module.stock.service.impl; import cn.qihangerp.module.stock.domain.WmsInventoryOperation; import cn.qihangerp.module.stock.mapper.WmsInventoryOperationMapper; -import cn.qihangerp.module.stock.service.WmsInventoryOperationService; +import cn.qihangerp.module.stock.service.ErpInventoryOperationService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -13,8 +13,8 @@ import org.springframework.stereotype.Service; * @createDate 2024-09-23 22:35:19 */ @Service -public class WmsInventoryOperationServiceImpl extends ServiceImpl - implements WmsInventoryOperationService { +public class ErpInventoryOperationServiceImpl extends ServiceImpl + implements ErpInventoryOperationService { } diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsStockOutItemPositionServiceImpl.java b/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutItemPositionServiceImpl.java similarity index 58% rename from module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsStockOutItemPositionServiceImpl.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutItemPositionServiceImpl.java index fb523011..653b7634 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsStockOutItemPositionServiceImpl.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutItemPositionServiceImpl.java @@ -1,8 +1,8 @@ package cn.qihangerp.module.stock.service.impl; import cn.qihangerp.module.stock.domain.ErpStockOutItemPosition; -import cn.qihangerp.module.stock.mapper.WmsStockOutItemPositionMapper; -import cn.qihangerp.module.stock.service.WmsStockOutItemPositionService; +import cn.qihangerp.module.stock.mapper.ErpStockOutItemPositionMapper; +import cn.qihangerp.module.stock.service.ErpStockOutItemPositionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -13,8 +13,8 @@ import org.springframework.stereotype.Service; * @createDate 2024-09-22 11:13:23 */ @Service -public class WmsStockOutItemPositionServiceImpl extends ServiceImpl - implements WmsStockOutItemPositionService { +public class ErpStockOutItemPositionServiceImpl extends ServiceImpl + implements ErpStockOutItemPositionService { } diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsStockOutItemServiceImpl.java b/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutItemServiceImpl.java similarity index 65% rename from module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsStockOutItemServiceImpl.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutItemServiceImpl.java index 4baa273c..54c8c8ab 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsStockOutItemServiceImpl.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutItemServiceImpl.java @@ -1,8 +1,8 @@ package cn.qihangerp.module.stock.service.impl; import cn.qihangerp.module.stock.domain.ErpStockOutItem; -import cn.qihangerp.module.stock.mapper.WmsStockOutItemMapper; -import cn.qihangerp.module.stock.service.WmsStockOutItemService; +import cn.qihangerp.module.stock.mapper.ErpStockOutItemMapper; +import cn.qihangerp.module.stock.service.ErpStockOutItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -13,8 +13,8 @@ import org.springframework.stereotype.Service; * @createDate 2024-09-22 11:13:23 */ @Service -public class WmsStockOutItemServiceImpl extends ServiceImpl - implements WmsStockOutItemService { +public class ErpStockOutItemServiceImpl extends ServiceImpl + implements ErpStockOutItemService { } diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsStockOutServiceImpl.java b/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java similarity index 95% rename from module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsStockOutServiceImpl.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java index 86b5e4b9..dac0bc0b 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsStockOutServiceImpl.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java @@ -12,13 +12,13 @@ import cn.qihangerp.module.goods.service.OGoodsInventoryService; import cn.qihangerp.module.stock.domain.ErpStockOut; import cn.qihangerp.module.stock.domain.ErpStockOutItem; import cn.qihangerp.module.stock.domain.ErpStockOutItemPosition; -import cn.qihangerp.module.stock.mapper.WmsStockOutItemPositionMapper; -import cn.qihangerp.module.stock.mapper.WmsStockOutMapper; +import cn.qihangerp.module.stock.mapper.ErpStockOutItemPositionMapper; +import cn.qihangerp.module.stock.mapper.ErpStockOutMapper; import cn.qihangerp.module.stock.request.GoodsSkuInventoryVo; import cn.qihangerp.module.stock.request.StockOutCreateRequest; import cn.qihangerp.module.stock.request.StockOutItemRequest; -import cn.qihangerp.module.stock.service.WmsStockOutItemService; -import cn.qihangerp.module.stock.service.WmsStockOutService; +import cn.qihangerp.module.stock.service.ErpStockOutItemService; +import cn.qihangerp.module.stock.service.ErpStockOutService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -41,11 +41,11 @@ import java.util.stream.Collectors; */ @AllArgsConstructor @Service -public class WmsStockOutServiceImpl extends ServiceImpl - implements WmsStockOutService { - private final WmsStockOutMapper outMapper; - private final WmsStockOutItemService outItemService; - private final WmsStockOutItemPositionMapper outItemPositionMapper; +public class ErpStockOutServiceImpl extends ServiceImpl + implements ErpStockOutService { + private final ErpStockOutMapper outMapper; + private final ErpStockOutItemService outItemService; + private final ErpStockOutItemPositionMapper outItemPositionMapper; private final OGoodsInventoryBatchService goodsInventoryBatchService; private final OGoodsInventoryService goodsInventoryService; diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsWarehousePositionServiceImpl.java b/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehousePositionServiceImpl.java similarity index 50% rename from module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsWarehousePositionServiceImpl.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehousePositionServiceImpl.java index f77fc471..aae74a6a 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsWarehousePositionServiceImpl.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehousePositionServiceImpl.java @@ -1,8 +1,8 @@ package cn.qihangerp.module.stock.service.impl; -import cn.qihangerp.module.stock.domain.WmsWarehousePosition; -import cn.qihangerp.module.stock.mapper.WmsWarehousePositionMapper; -import cn.qihangerp.module.stock.service.WmsWarehousePositionService; +import cn.qihangerp.module.stock.domain.ErpWarehousePosition; +import cn.qihangerp.module.stock.mapper.ErpWarehousePositionMapper; +import cn.qihangerp.module.stock.service.ErpWarehousePositionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -13,8 +13,8 @@ import org.springframework.stereotype.Service; * @createDate 2024-09-22 11:13:23 */ @Service -public class WmsWarehousePositionServiceImpl extends ServiceImpl - implements WmsWarehousePositionService { +public class ErpWarehousePositionServiceImpl extends ServiceImpl + implements ErpWarehousePositionService { } diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsWarehouseServiceImpl.java b/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehouseServiceImpl.java similarity index 51% rename from module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsWarehouseServiceImpl.java rename to module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehouseServiceImpl.java index 379113f8..f99530fa 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsWarehouseServiceImpl.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehouseServiceImpl.java @@ -1,8 +1,8 @@ package cn.qihangerp.module.stock.service.impl; -import cn.qihangerp.module.stock.domain.WmsWarehouse; -import cn.qihangerp.module.stock.mapper.WmsWarehouseMapper; -import cn.qihangerp.module.stock.service.WmsWarehouseService; +import cn.qihangerp.module.stock.domain.ErpWarehouse; +import cn.qihangerp.module.stock.mapper.ErpWarehouseMapper; +import cn.qihangerp.module.stock.service.ErpWarehouseService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -13,8 +13,8 @@ import org.springframework.stereotype.Service; * @createDate 2024-09-22 11:13:23 */ @Service -public class WmsWarehouseServiceImpl extends ServiceImpl - implements WmsWarehouseService { +public class ErpWarehouseServiceImpl extends ServiceImpl + implements ErpWarehouseService { } diff --git a/module/stock/src/main/resources/mapper/WmsStockInItemMapper.xml b/module/stock/src/main/resources/mapper/ErpStockInItemMapper.xml similarity index 97% rename from module/stock/src/main/resources/mapper/WmsStockInItemMapper.xml rename to module/stock/src/main/resources/mapper/ErpStockInItemMapper.xml index 743812b0..a2928100 100644 --- a/module/stock/src/main/resources/mapper/WmsStockInItemMapper.xml +++ b/module/stock/src/main/resources/mapper/ErpStockInItemMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/module/stock/src/main/resources/mapper/WmsStockInMapper.xml b/module/stock/src/main/resources/mapper/ErpStockInMapper.xml similarity index 96% rename from module/stock/src/main/resources/mapper/WmsStockInMapper.xml rename to module/stock/src/main/resources/mapper/ErpStockInMapper.xml index a9b6e363..55ed07bc 100644 --- a/module/stock/src/main/resources/mapper/WmsStockInMapper.xml +++ b/module/stock/src/main/resources/mapper/ErpStockInMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/module/stock/src/main/resources/mapper/WmsStockOutItemMapper.xml b/module/stock/src/main/resources/mapper/ErpStockOutItemMapper.xml similarity index 96% rename from module/stock/src/main/resources/mapper/WmsStockOutItemMapper.xml rename to module/stock/src/main/resources/mapper/ErpStockOutItemMapper.xml index 64ae313b..30041dd6 100644 --- a/module/stock/src/main/resources/mapper/WmsStockOutItemMapper.xml +++ b/module/stock/src/main/resources/mapper/ErpStockOutItemMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/module/stock/src/main/resources/mapper/WmsStockOutItemPositionMapper.xml b/module/stock/src/main/resources/mapper/ErpStockOutItemPositionMapper.xml similarity index 95% rename from module/stock/src/main/resources/mapper/WmsStockOutItemPositionMapper.xml rename to module/stock/src/main/resources/mapper/ErpStockOutItemPositionMapper.xml index 61b651bc..7d69fa92 100644 --- a/module/stock/src/main/resources/mapper/WmsStockOutItemPositionMapper.xml +++ b/module/stock/src/main/resources/mapper/ErpStockOutItemPositionMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/module/stock/src/main/resources/mapper/WmsStockOutMapper.xml b/module/stock/src/main/resources/mapper/ErpStockOutMapper.xml similarity index 97% rename from module/stock/src/main/resources/mapper/WmsStockOutMapper.xml rename to module/stock/src/main/resources/mapper/ErpStockOutMapper.xml index 064b029b..444eb205 100644 --- a/module/stock/src/main/resources/mapper/WmsStockOutMapper.xml +++ b/module/stock/src/main/resources/mapper/ErpStockOutMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/module/stock/src/main/resources/mapper/WmsWarehouseMapper.xml b/module/stock/src/main/resources/mapper/ErpWarehouseMapper.xml similarity index 94% rename from module/stock/src/main/resources/mapper/WmsWarehouseMapper.xml rename to module/stock/src/main/resources/mapper/ErpWarehouseMapper.xml index 905f64cc..22905785 100644 --- a/module/stock/src/main/resources/mapper/WmsWarehouseMapper.xml +++ b/module/stock/src/main/resources/mapper/ErpWarehouseMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/module/stock/src/main/resources/mapper/WmsWarehousePositionMapper.xml b/module/stock/src/main/resources/mapper/ErpWarehousePositionMapper.xml similarity index 94% rename from module/stock/src/main/resources/mapper/WmsWarehousePositionMapper.xml rename to module/stock/src/main/resources/mapper/ErpWarehousePositionMapper.xml index 3ecb68db..081161c1 100644 --- a/module/stock/src/main/resources/mapper/WmsWarehousePositionMapper.xml +++ b/module/stock/src/main/resources/mapper/ErpWarehousePositionMapper.xml @@ -2,9 +2,9 @@ - + - +