From 2e1c09d07055e373b232de517ccd8c3d27fe852f Mon Sep 17 00:00:00 2001 From: x_z Date: Sun, 8 Jan 2023 17:02:49 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=B9=B3=E8=A1=A1=E8=A1=A5?= =?UTF-8?q?=E5=8D=95=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98=202.?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=93=E5=BA=93=E5=AD=97=E5=85=B8=E5=85=B3?= =?UTF-8?q?=E8=81=94=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BB=93=E5=BA=93=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=9F=A5=E5=87=BA=E7=A6=81=E7=94=A8=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sale/admin/req/thrsys/FilterThrInvWarehouseRequest.java | 5 +++++ .../glxp/sale/admin/service/inout/impl/OrderServiceImpl.java | 2 +- .../resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrInvWarehouseRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrInvWarehouseRequest.java index bef05a4..f68ed99 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrInvWarehouseRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrInvWarehouseRequest.java @@ -23,4 +23,9 @@ public class FilterThrInvWarehouseRequest extends ListPageRequest { * 第三方系统标识 */ private String thirdSysFk; + + /** + * 状态 0：禁用 1：启用 + */ + private Integer status; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java index 3f6b598..5bd4464 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java @@ -271,7 +271,7 @@ public class OrderServiceImpl implements OrderService { supplementOrder.setSubInvCode(order.getInvStorageCode()); supplementOrder.setFromSubInvCode(order.getInvWarehouseCode()); //根据分库code查询总库coder - InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseDao.filterGroupInvSubAndcode(order.getFromCorpId()); + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseDao.filterGroupInvSubAndcode(order.getFromSubInvCode()); supplementOrder.setLocStorageCode(invSubWarehouseEntity.getParentId()); supplementOrder.setInvStorageCode(invSubWarehouseEntity.getParentId()); String name = invWarehouseDao.getNameByCode(order.getInvStorageCode()); diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml index 1ea324a..075c72e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml @@ -34,6 +34,9 @@ and thirdSysFk = #{thirdSysFk} + + AND status = #{status} +