diff --git a/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java b/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java index 3429862..c68e212 100644 --- a/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java +++ b/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java @@ -329,6 +329,8 @@ public class OrderController { PostUdimsOrderRequest.OrderBean orderBean = new PostUdimsOrderRequest.OrderBean(); BeanUtils.copyProperties(orderEntity, orderBean); orderBean.setAction(unitMaintainEntity.getTargetAction()); + orderBean.setInvStorageCode(unitMaintainEntity.getInvCode()); + orderBean.setInvWarehouseCode(unitMaintainEntity.getInvSubCode()); WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); warehouseQueryRequest.setOrderId(orderEntity.getOrderId()); List warehouseEntities = warehouseService.filterWarehouse(warehouseQueryRequest); diff --git a/src/main/java/com/glxp/udi/admin/dao/info/PlatformDao.java b/src/main/java/com/glxp/udi/admin/dao/info/PlatformDao.java index 45f1c6b..0464ff1 100644 --- a/src/main/java/com/glxp/udi/admin/dao/info/PlatformDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/info/PlatformDao.java @@ -1,7 +1,6 @@ package com.glxp.udi.admin.dao.info; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.info.PlatformEntity; import com.glxp.udi.admin.res.info.PlatformLinkResponse; @@ -28,7 +27,7 @@ public interface PlatformDao extends BaseMapper { * @param platformLinkRequest * @return */ - IPage getLinkPlatformList(IPage page, String customerId, String key); + List getLinkPlatformList(@Param("customerId") String customerId, @Param("key") String key); /** * 根据名称和访问地址查询平台信息 diff --git a/src/main/java/com/glxp/udi/admin/req/inout/PostUdimsOrderRequest.java b/src/main/java/com/glxp/udi/admin/req/inout/PostUdimsOrderRequest.java index f3862a1..567ddfa 100644 --- a/src/main/java/com/glxp/udi/admin/req/inout/PostUdimsOrderRequest.java +++ b/src/main/java/com/glxp/udi/admin/req/inout/PostUdimsOrderRequest.java @@ -22,6 +22,8 @@ public class PostUdimsOrderRequest { private String fromCorpId; private String fromCorp; private String remark; + private String invStorageCode; + private String invWarehouseCode; private List orderDetails; private List codes; diff --git a/src/main/java/com/glxp/udi/admin/service/info/PlatformService.java b/src/main/java/com/glxp/udi/admin/service/info/PlatformService.java index 7611942..a7cb948 100644 --- a/src/main/java/com/glxp/udi/admin/service/info/PlatformService.java +++ b/src/main/java/com/glxp/udi/admin/service/info/PlatformService.java @@ -108,8 +108,11 @@ public class PlatformService { return new Page<>(); } - IPage page = new Page<>(platformLinkRequest.getPage(), platformLinkRequest.getLimit()); - return platformDao.getLinkPlatformList(page, platformLinkRequest.getCustomerId(), platformLinkRequest.getKey()); + IPage page = new Page<>(); + List list = platformDao.getLinkPlatformList(platformLinkRequest.getCustomerId(), platformLinkRequest.getKey()); + page.setRecords(list); + page.setTotal(list.size()); + return page; } /** diff --git a/src/main/resources/mybatis/mapper/info/PlatformDao.xml b/src/main/resources/mybatis/mapper/info/PlatformDao.xml index b2ad9e8..0f9acb9 100644 --- a/src/main/resources/mybatis/mapper/info/PlatformDao.xml +++ b/src/main/resources/mybatis/mapper/info/PlatformDao.xml @@ -2,7 +2,6 @@ - replace into auth_platform (id, name, host)