diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderClient.java index b06092719..874bfee69 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderClient.java @@ -44,10 +44,10 @@ public interface IOrderClient { List findOrderListByParam(@RequestParam String param); @GetMapping(API_PREFIX + "/getTotalCountBy") - Integer getTotalCountBy(@RequestParam String param, @RequestParam Integer oldWarehouseId); + Integer getTotalCountBy(@RequestParam String param, @RequestParam Integer oldWarehouseId, @RequestParam String tableName); @GetMapping(API_PREFIX + "/findOrderCodeListByPage") - List findOrderCodeListByPage(@RequestParam String param, @RequestParam Integer oldWarehouseId, @RequestParam Integer pageNum, @RequestParam Integer pageSize); + List findOrderCodeListByPage(@RequestParam String param, @RequestParam Integer oldWarehouseId, @RequestParam Integer pageNum, @RequestParam Integer pageSize, @RequestParam String tableName); @GetMapping(API_PREFIX + "/getGoodsTypeByOrderCode") Integer getGoodsTypeByOrderCode(@RequestParam String orderCode,@RequestParam Integer oldWarehouseId); @@ -57,4 +57,9 @@ public interface IOrderClient { @GetMapping(API_PREFIX + "/findOrderCodeListByZero") List findOrderCodeListByZero(@RequestParam String param, @RequestParam Integer oldWarehouseId, @RequestParam Integer pageNum, @RequestParam Integer pageSize); + + @GetMapping(API_PREFIX + "/getTotalCountByInventory") + Integer getTotalCountByInventory(@RequestParam String param, @RequestParam Integer oldWarehouseId); + + List findOrderCodeListByPageWithInventoryId(@RequestParam String param, @RequestParam Integer oldWarehouseId, @RequestParam Integer pageNum, @RequestParam Integer pageSize); } diff --git a/blade-service-api/logpm-patch-api/src/main/java/com/logpm/patch/entity/WarehouseMappingDataEntity.java b/blade-service-api/logpm-patch-api/src/main/java/com/logpm/patch/entity/WarehouseMappingDataEntity.java index 53593f0d7..6f7c75da4 100644 --- a/blade-service-api/logpm-patch-api/src/main/java/com/logpm/patch/entity/WarehouseMappingDataEntity.java +++ b/blade-service-api/logpm-patch-api/src/main/java/com/logpm/patch/entity/WarehouseMappingDataEntity.java @@ -23,4 +23,6 @@ public class WarehouseMappingDataEntity { private Integer inventoryId; + private String tableName; + } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/OrderClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/OrderClient.java index 758289585..41a094e2a 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/OrderClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/OrderClient.java @@ -48,13 +48,13 @@ public class OrderClient implements IOrderClient { } @Override - public Integer getTotalCountBy(String param, Integer oldWarehouseId) { - return orderService.getTotalCountBy(param,oldWarehouseId); + public Integer getTotalCountBy(String param, Integer oldWarehouseId,String tableName) { + return orderService.getTotalCountBy(param,oldWarehouseId,tableName); } @Override - public List findOrderCodeListByPage(String param, Integer oldWarehouseId, Integer pageNum, Integer pageSize) { - return orderService.findOrderCodeListByPage(param,oldWarehouseId,pageNum,pageSize); + public List findOrderCodeListByPage(String param, Integer oldWarehouseId, Integer pageNum, Integer pageSize,String tableName) { + return orderService.findOrderCodeListByPage(param,oldWarehouseId,pageNum,pageSize,tableName); } @Override @@ -71,4 +71,14 @@ public class OrderClient implements IOrderClient { public List findOrderCodeListByZero(String param, Integer oldWarehouseId, Integer pageNum, Integer pageSize) { return orderService.findOrderCodeListByZero(param,oldWarehouseId,pageNum,pageSize); } + + @Override + public Integer getTotalCountByInventory(String param, Integer oldWarehouseId) { + return orderService.getTotalCountByInventory(param,oldWarehouseId); + } + + @Override + public List findOrderCodeListByPageWithInventoryId(String param, Integer oldWarehouseId, Integer pageNum, Integer pageSize) { + return orderService.findOrderCodeListByPageWithInventoryId(param,oldWarehouseId,pageNum,pageSize); + } } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.java index a05b60d0f..a7a10772c 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.java @@ -30,13 +30,17 @@ import java.util.List; */ public interface OrderMapper extends BaseMapper { - Integer getTotalCountBy(@Param("param") String param, @Param("oldWarehouseId") Integer oldWarehouseId); + Integer getTotalCountBy(@Param("param") String param, @Param("oldWarehouseId") Integer oldWarehouseId, @Param("tableName") String tableName); - List findOrderCodeListByPage(@Param("param") String param, @Param("oldWarehouseId") Integer oldWarehouseId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize); + List findOrderCodeListByPage(@Param("param") String param, @Param("oldWarehouseId") Integer oldWarehouseId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize, @Param("tableName") String tableName); Integer getGoodsTypeByOrderCode(@Param("orderCode") String orderCode,@Param("oldWarehouseId") Integer oldWarehouseId); Integer getTotalCountByZero(@Param("param") String param, @Param("oldWarehouseId") Integer oldWarehouseId); List findOrderCodeListByZero(@Param("param") String param, @Param("oldWarehouseId") Integer oldWarehouseId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize); + + Integer getTotalCountByInventory(@Param("param") String param, @Param("oldWarehouseId") Integer oldWarehouseId); + + List findOrderCodeListByPageWithInventoryId(@Param("param") String param, @Param("oldWarehouseId") Integer oldWarehouseId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml index 72509ccde..a0bfc6053 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml @@ -4,29 +4,82 @@ + - SELECT `i`.`orderSelfNum` FROM @@ -46,6 +99,27 @@ `i`.`id` ASC LIMIT #{pageNum},#{pageSize} + findOrderCodeListByPage +