From 838d5bdf54028ec22611f3635d138520219eb56d Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 18 Oct 2022 14:22:15 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E5=8C=BB?= =?UTF-8?q?=E9=99=A2=E5=AE=A2=E6=88=B7=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=202.=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8D=95=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/udi/admin/controller/inout/OrderController.java | 2 ++ src/main/java/com/glxp/udi/admin/dao/info/PlatformDao.java | 3 +-- .../glxp/udi/admin/req/inout/PostUdimsOrderRequest.java | 2 ++ .../com/glxp/udi/admin/service/info/PlatformService.java | 7 +++++-- src/main/resources/mybatis/mapper/info/PlatformDao.xml | 1 - 5 files changed, 10 insertions(+), 5 deletions(-) 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)